From 82ffa1826339c79cd84b68543f26192cddb8015b Mon Sep 17 00:00:00 2001
From: Maxime Roux <max@2600hz.com>
Date: Fri, 30 Jan 2015 15:31:57 -0800
Subject: [PATCH] UI-1096: updated the call entities dropdown in Incoming Call
 Handling (Main Number) to use 'users' instead of 'user callflows'.

---
 submodules/strategy/strategy.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index eaacb71..2f31b6f 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -360,7 +360,7 @@ define(function(require){
 										type: "default"
 									},
 									callflow: callflowName,
-									callEntities: self.strategyGetCallEntitiesDropdownData(strategyData.callEntities),
+									callEntities: self.strategyGetCallEntitiesDropdownData(strategyData.callEntities, true),
 									voicemails: strategyData.voicemails,
 									tabMessage: self.i18n.active().strategy.calls.callTabsMessages[callflowName]
 								};
@@ -1588,11 +1588,18 @@ define(function(require){
 			});
 		},
 
-		strategyGetCallEntitiesDropdownData: function(callEntities) {
+		strategyGetCallEntitiesDropdownData: function(callEntities, useBasicUser) {
 			var self = this,
+				useBasicUser = (useBasicUser === true) || false,
+				entities = $.extend(true, {}, callEntities),
 				results = [];
 
-			_.each(callEntities, function(value, key) {
+			if(!useBasicUser) {
+				entities.user = entities.userCallflows;
+			}
+			delete entities.userCallflows;
+
+			_.each(entities, function(value, key) {
 				var group = {
 						groupName: self.i18n.active().strategy.callEntities[key],
 						groupType: key,
@@ -2107,7 +2114,8 @@ define(function(require){
 				function(err, results) {
 					var callEntities = {
 						device: results.devices,
-						user: [],
+						user: $.extend(true, [], results.users),
+						userCallflows: [],
 						ring_group: []
 					};
 
@@ -2123,7 +2131,7 @@ define(function(require){
 						} else {
 							user.module = 'user';
 						}
-						callEntities.user.push(user);
+						callEntities.userCallflows.push(user);
 					});
 
 					_.each(results.groups, function(group) {