Merge remote-tracking branch 'origin/master'

submodules/users/users.js

@@ -326,20 +326,6 @@ define(function(require){
 				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 @@ define(function(require){
 
 				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 @@ define(function(require){
 
 							$.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;

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">