From e86b804008a9e9978446cb1822f5ae63be7255e9 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Wed, 27 Jan 2016 16:40:29 -0800
Subject: [PATCH] UI-2016: Fixed an issue with numbers common control

---
 apps/common/submodules/numbers/numbers.js   | 33 +++++++++++----------
 apps/common/views/numbers-spare.html        | 10 +++----
 apps/common/views/numbers-spareAccount.html |  5 ++++
 apps/websockets                             |  1 +
 4 files changed, 29 insertions(+), 20 deletions(-)
 create mode 160000 apps/websockets

diff --git a/apps/common/submodules/numbers/numbers.js b/apps/common/submodules/numbers/numbers.js
index 31066de41..ec9bc7c4f 100644
--- a/apps/common/submodules/numbers/numbers.js
+++ b/apps/common/submodules/numbers/numbers.js
@@ -74,6 +74,8 @@ define(function(require){
 				value.friendlyUsedBy = self.i18n.active().numbers[value.used_by];
 			}
 
+			value.isLocal = value.features.indexOf('local') > -1;
+
 			return value;
 		},
 
@@ -130,22 +132,15 @@ define(function(require){
 
 				value = self.numbersFormatNumber(value);
 
-				if(value.used_by) {
-					if(data.viewType === 'pbx') {
-						if(value.used_by === 'callflow' || value.used_by === 'mobile') {
-							value.isLocal = value.features.indexOf('local') > -1;
-							thisAccount.usedNumbers.push(value);
-						}
-					}
-					else {
-						value.isLocal = value.features.indexOf('local') > -1;
-						thisAccount.usedNumbers.push(value);
-					}
-				}
-				else {
-					value.isLocal = value.features.indexOf('local') > -1;
+				if(!value.used_by) {
 					thisAccount.spareNumbers.push(value);
 				}
+				else if(data.viewType !== 'pbx') {
+					thisAccount.usedNumbers.push(value)
+				}
+				else if(value.used_by === 'callflow' || value.used_by === 'mobile') {
+					thisAccount.usedNumbers.push(value);
+				}
 			});
 
 			thisAccount.countUsedNumbers = thisAccount.usedNumbers.length;
@@ -221,7 +216,15 @@ define(function(require){
 
 									value = self.numbersFormatNumber(value);
 
-									value.used_by ? usedNumbers.push(value) : spareNumbers.push(value);
+									if(!value.used_by) {
+										spareNumbers.push(value)
+									}
+									else if(listType === 'full') {
+										usedNumbers.push(value);
+									}
+									else if(value.used_by === 'callflow' || value.used_by === 'mobile') {
+										usedNumbers.push(value);
+									}
 								}
 							});
 
diff --git a/apps/common/views/numbers-spare.html b/apps/common/views/numbers-spare.html
index 140390c4a..8121e8eed 100644
--- a/apps/common/views/numbers-spare.html
+++ b/apps/common/views/numbers-spare.html
@@ -82,11 +82,11 @@
 								<span class="city">{{ this.friendlyLocality }}</span>
 							{{/if}}
 						</span>
-					{{#compare this.state '===' 'port_in'}}
-						<div class="features pull-right">
-							<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../../i18n.numbers.portIconHelp}}"></i>
-						</div>
-					{{/compare}}
+						{{#compare this.state '===' 'port_in'}}
+							<div class="features pull-right">
+								<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../../i18n.numbers.portIconHelp}}"></i>
+							</div>
+						{{/compare}}
 					</div>
 				{{else}}
 					<div class="number-box no-data">
diff --git a/apps/common/views/numbers-spareAccount.html b/apps/common/views/numbers-spareAccount.html
index 28f439a74..97fc5eb79 100644
--- a/apps/common/views/numbers-spareAccount.html
+++ b/apps/common/views/numbers-spareAccount.html
@@ -10,6 +10,11 @@
 				<span class="city">{{ this.friendlyLocality }}</span>
 			{{/if}}
 		</span>
+		{{#compare this.state '===' 'port_in'}}
+			<div class="features pull-right">
+				<i class="fa fa-exclamation-triangle monster-red active help-popover" data-toggle="tooltip" data-placement="top" data-original-title="{{../../i18n.numbers.portIconHelp}}"></i>
+			</div>
+		{{/compare}}
 	</div>
 {{else}}
 	<div class="number-box no-data">
diff --git a/apps/websockets b/apps/websockets
new file mode 160000
index 000000000..f0b945a6e
--- /dev/null
+++ b/apps/websockets
@@ -0,0 +1 @@
+Subproject commit f0b945a6e4a460cb14cb8c8f9316465b03ca9467