From 40923c16736455407695ab12d239d2d02497daa9 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Mon, 14 Mar 2016 17:33:09 -0700
Subject: [PATCH 1/3] UI-2023: Remove redundant code created by 3fa81215

---
 submodules/users/users.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 3db9df6..e13cbd0 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -42,7 +42,7 @@ define(function(require){
 				var dataTemplate = self.usersFormatListData(data),
 					template = $(monster.template(self, 'users-layout', dataTemplate)),
 					templateUser;
-
+console.log(dataTemplate);
 				_.each(dataTemplate.users, function(user) {
 					templateUser = monster.template(self, 'users-row', user);
 
@@ -327,18 +327,18 @@ define(function(require){
 			});
 
 			// Inject MDNs into the numbers' indicator so they are displayed like Kazoo numbers
-			_.each(data.devices, function(device, idx) {
-				if (device.device_type === 'mobile'&& device.hasOwnProperty('owner_id')) {
-					var user = mapUsers[device.owner_id];
-
-					if (user.extra.phoneNumber === '') {
-						user.extra.phoneNumber = device.mobile.mdn;
-					}
-					else {
-						user.extra.additionalNumbers++;
-					}
-				}
-			});
+			// _.each(data.devices, function(device, idx) {
+			// 	if (device.device_type === 'mobile'&& device.hasOwnProperty('owner_id')) {
+			// 		var user = mapUsers[device.owner_id];
+
+			// 		if (user.extra.phoneNumber === '') {
+			// 			user.extra.phoneNumber = device.mobile.mdn;
+			// 		}
+			// 		else {
+			// 			user.extra.additionalNumbers++;
+			// 		}
+			// 	}
+			// });
 
 			_.each(data.callflows, function(callflow) {
 				if(callflow.type !== 'faxing') {

From 0d8268f1cd075109107e21b883c8bc5c57ceb1df Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Tue, 15 Mar 2016 11:41:24 -0700
Subject: [PATCH 2/3] UI-2023: Specificaly select the 'MainUserCallflow' to
 edit user's numbers

---
 submodules/users/users.js | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index e13cbd0..01ef454 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -42,7 +42,7 @@ define(function(require){
 				var dataTemplate = self.usersFormatListData(data),
 					template = $(monster.template(self, 'users-layout', dataTemplate)),
 					templateUser;
-console.log(dataTemplate);
+
 				_.each(dataTemplate.users, function(user) {
 					templateUser = monster.template(self, 'users-row', user);
 
@@ -326,20 +326,6 @@ console.log(dataTemplate);
 				mapUsers[user.id] = self.usersFormatUserData(user);
 			});
 
-			// Inject MDNs into the numbers' indicator so they are displayed like Kazoo numbers
-			// _.each(data.devices, function(device, idx) {
-			// 	if (device.device_type === 'mobile'&& device.hasOwnProperty('owner_id')) {
-			// 		var user = mapUsers[device.owner_id];
-
-			// 		if (user.extra.phoneNumber === '') {
-			// 			user.extra.phoneNumber = device.mobile.mdn;
-			// 		}
-			// 		else {
-			// 			user.extra.additionalNumbers++;
-			// 		}
-			// 	}
-			// });
-
 			_.each(data.callflows, function(callflow) {
 				if(callflow.type !== 'faxing') {
 					var userId = callflow.owner_id;
@@ -1147,9 +1133,12 @@ console.log(dataTemplate);
 
 				template.find('.item-row').each(function(k, row) {
 					var row = $(row),
-						number = row.data('id');
+						number = row.data('id'),
+						type = row.data('type');
 
-					dataNumbers.push(number);
+					if (type !== 'mobile') {
+						dataNumbers.push(number);
+					}
 				});
 
 				if(dataNumbers.length > 0) {
@@ -2644,7 +2633,7 @@ console.log(dataTemplate);
 
 							$.each(callflows, function(k, callflowLoop) {
 								/* Find Smart PBX Callflow of this user */
-								if(callflowLoop.owner_id === userId && callflowLoop.type !== 'faxing') {
+								if(callflowLoop.owner_id === userId && callflowLoop.type === 'mainUserCallflow') {
 									callflowId = callflowLoop.id;
 
 									return false;

From deaaf67267232cc56623068caccae2abc9906f87 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <odeonn@gmail.com>
Date: Wed, 16 Mar 2016 14:52:29 -0700
Subject: [PATCH 3/3] UI-1957: Exposing field for suppress unregister
 notifications

---
 views/devices-softphone.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 705dbec..9ad1907 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -170,6 +170,15 @@
 					</label>
 				</div>
 
+				<div class="control-group">
+					<label class="control-label checkbox">
+						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.unregisterNotifications.label }}
+							<input type="checkbox" name="extra.notify_unregister" id="notify_unregister" {{#unless suppress_unregister_notifications}}checked{{/unless}} />
+						{{/monsterCheckbox}}
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.miscellaneous.unregisterNotifications.help}}" data-placement="top" data-toggle="tooltip"></i>
+					</label>
+				</div>
+
 				<div class="rtp-line">
 					<div class="control-group">
 						<label class="control-label checkbox">