From 1ef1e25f9a7cc0bb52da39a4c2e1fd975a0e357b Mon Sep 17 00:00:00 2001 From: Maxime Roux Date: Fri, 11 Sep 2015 16:31:14 -0700 Subject: [PATCH] UI-1806: fixed a bug that was occuring when some Main Callflows were missing --- submodules/strategy/strategy.js | 44 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index f65815d..8c4edbc 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -1874,7 +1874,7 @@ define(function(require){ container = popup.find('#strategy_menu_popup'), ttsGreeting = container.find('#strategy_menu_popup_tts_greeting'), uploadGreeting = container.find('#strategy_menu_popup_upload_greeting'), - mediaToUpload = undefined; + mediaToUpload; container.find('.target-select').chosen({ search_contains: true, width: '150px' }); @@ -2260,25 +2260,26 @@ define(function(require){ menuRequests = {}; _.each(data.data, function(val, key) { - if(val.type === "main" || val.type === "conference") - var name = val.name || val.numbers[0]; - if (val.type === 'conference') { - name = "MainConference" - } - else if (val.type === "faxing") { - name = "MainFaxing"; - } - parallelRequests[name] = function(callback) { - self.callApi({ - resource: 'callflow.get', - data: { - accountId: self.accountId, - callflowId: val.id - }, - success: function(data, status) { - callback(null, data.data); - } - }); + if(val.type === "main" || val.type === "conference" || val.type === "faxing") { + var name = val.name || val.numbers[0]; + if (val.type === 'conference') { + name = "MainConference" + } + else if (val.type === "faxing") { + name = "MainFaxing"; + } + parallelRequests[name] = function(callback) { + self.callApi({ + resource: 'callflow.get', + data: { + accountId: self.accountId, + callflowId: val.id + }, + success: function(data, status) { + callback(null, data.data); + } + }); + } } }); @@ -2384,6 +2385,9 @@ define(function(require){ } }); } + } else if(!parallelRequests[val]) { + menuRequests[menuName] = parallelRequests[menuName]; + delete parallelRequests[menuName]; } });