From fc01360f136aa10623de6b46e59ed51088ae185d Mon Sep 17 00:00:00 2001
From: Robert Axelsen <raxelsen@sipwise.com>
Date: Tue, 5 Sep 2017 18:19:37 +0200
Subject: [PATCH] TT#20650 Prevent timeout non-number destinations

Change-Id: I03f49f097efd6cdaeaf8af61aabf3382607aaabf
---
 .../callforward/CallForwardController.js      | 66 +++++++++++--------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/classic/src/view/pages/callforward/CallForwardController.js b/classic/src/view/pages/callforward/CallForwardController.js
index 8a2f636e..3e3a3376 100644
--- a/classic/src/view/pages/callforward/CallForwardController.js
+++ b/classic/src/view/pages/callforward/CallForwardController.js
@@ -253,25 +253,47 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardController', {
             if (data.destination !== 'own phone') {
                 switch (recordsToSend.length === 0 || !me.destinationIdExistsInArray(recordsToSend, data.destinationset_id)) {
                     case true:
-                        recordsToSend.push({
-                            id: data.destinationset_id,
-                            records: [{
-                                "announcement_id": null,
-                                "destination": data.destination,
-                                "priority": data.priority,
-                                "timeout": data.timeout
-                            }]
-                        });
-                        break;
-                    case false:
-                        recordsToSend.forEach(function(obj, index) {
-                            if (obj.id == data.destinationset_id) {
-                                recordsToSend[index].records.push({
+                    // if recordsToSend array is empty or recordsToSend does not already contain current destinationset already
+                        if (data.timeout) {
+                            recordsToSend.push({
+                                id: data.destinationset_id,
+                                records: [{
                                     "announcement_id": null,
                                     "destination": data.destination,
                                     "priority": data.priority,
                                     "timeout": data.timeout
-                                });
+                                }]
+                            });
+                        } else {
+                            recordsToSend.push({
+                                id: data.destinationset_id,
+                                records: [{
+                                    "announcement_id": null,
+                                    "destination": data.destination,
+                                    "priority": data.priority
+                                }]
+                            });
+                        };
+                        break;
+                    case false:
+                    // if destinationset has already been added to recordsToSend, push to the records field for that destinationset,
+                    // building up an array of destination objects to write to API
+                        recordsToSend.forEach(function(obj, index) {
+                            if (obj.id == data.destinationset_id) {
+                                if (data.timeout) {
+                                    recordsToSend[index].records.push({
+                                        "announcement_id": null,
+                                        "destination": data.destination,
+                                        "priority": data.priority,
+                                        "timeout": data.timeout
+                                    });
+                                } else {
+                                    recordsToSend[index].records.push({
+                                        "announcement_id": null,
+                                        "destination": data.destination,
+                                        "priority": data.priority
+                                    });
+                                };
                             };
                         });
                         break;
@@ -1105,10 +1127,7 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardController', {
         var newTimeset = this.getTimeSetFromTimeSource(newTimesetName);
         var newType = this.getTypeFromTypeName(newTypeName, store);
         var newDestination = destination === 'Voicemail' ? 'voicebox' : destination.toLowerCase();
-        // TODO: Sets default timeout to 10 for non-number types, as can not be
-        // set to null. Not sure if this has any implication, so needs to be
-        // checked with Andreas
-        var newTimeout = !timeout ? '10' : timeout;
+        var newTimeout = !timeout ? null : timeout;
         if (!store.last()) { // if store empty we need to create new destset
             var newDestinationsetName = 'csc_defined_' + newType + '_' + Date.now();
             var subscriberId = localStorage.getItem('subscriber_id');
@@ -1135,15 +1154,6 @@ Ext.define('NgcpCsc.view.pages.callforward.CallForwardController', {
                     store.add(cfModel);
                     me.setLabelTerminationType(store);
                     store.sync();
-
-                    // TODO @Robert: do we need to create new timeset/sourceset here?
-                    // it seems to me that they have to exist already, if user is able
-                    // to create a new destination
-
-                    // Creates new sourceset/timeset if variable is not set to null
-                    //newSourceset && me.createNewStandardSet('/api/cfsourcesets/', newSourceset, subscriberId);
-                    //newTimeset && me.createNewStandardSet('/api/cftimesets/', newTimeset, subscriberId);
-
                     me.createNewMapping(subscriberId, newType, newDestinationsetName, newSourceset, newTimeset);
                 },
                 failure: function(response, opts) {