UI-691: You can now edit/delete device from the user device's section

submodules/devices/devices.js

@@ -56,7 +56,8 @@ define(function(require){
 
 		subscribe: {
 			'voip.devices.render': 'devicesRender',
-			'voip.devices.renderAdd': 'devicesRenderAdd'
+			'voip.devices.renderAdd': 'devicesRenderAdd',
+			'voip.devices.editDevice': 'devicesRenderEdit'
 		},
 
 		/* Users */
@@ -167,12 +168,10 @@ define(function(require){
 						id: $this.parents('.grid-row').data('id')
 					};
 
-				//self.devicesGetDevice(deviceId, function(dataDevice) {
-				self.devicesGetEditData(dataDevice, function(dataDevice) {
-					self.devicesRenderDevice(dataDevice, function(device) {
-						self.devicesRender({ deviceId: device.id });
-					});
-				});
+
+				self.devicesRenderEdit({ data: dataDevice, callbackSave: function(dataDevice) {
+					self.devicesRender({ deviceId: dataDevice.id });
+				}});
 			});
 
 			template.find('.create-device').on('click', function() {
@@ -187,6 +186,19 @@ define(function(require){
 			});
 		},
 
+		devicesRenderEdit: function(args) {
+			var self = this,
+				data = args.data,
+				callbackSave = args.callbackSave,
+				callbackDelete = args.callbackDelete || function(device) {
+					self.devicesRender();
+				};
+
+			self.devicesGetEditData(data, function(dataDevice) {
+				self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete);
+			});
+		},
+
 		devicesRenderAdd: function(args) {
 			var self = this,
 				type = args.type,
@@ -210,20 +222,20 @@ define(function(require){
 						});
 					},
 					callbackMissingBrand: function() {
-						self.devicesGetEditData(data, function(dataDevice) {
-							self.devicesRenderDevice(dataDevice, callback);
-						});
+						self.devicesRenderEdit({ data: data, callbackSave: function(dataDevice) {
+							callback && callback(dataDevice);
+						}});
 					}
 				});
 			}
 			else {
-				self.devicesGetEditData(data, function(dataDevice) {
-					self.devicesRenderDevice(dataDevice, callback);
-				});
+				self.devicesRenderEdit({ data: data, callbackSave: function(dataDevice) {
+					callback && callback(dataDevice);
+				}});
 			}
 		},
 
-		devicesRenderDevice: function(data, callback) {
+		devicesRenderDevice: function(data, callbackSave, callbackDelete) {
 			var self = this
 				mode = data.id ? 'edit' : 'add',
 				type = data.device_type,
@@ -303,7 +315,7 @@ define(function(require){
 					self.devicesSaveDevice(dataToSave, function(data) {
 						popup.dialog('close').remove();
 
-						callback && callback(data);
+						callbackSave && callbackSave(data);
 					});
 				} else {
 					templateDevice.find('.tabs-selector[data-section="basic"]').click();
@@ -315,10 +327,11 @@ define(function(require){
 
 				monster.ui.confirm(self.i18n.active().devices.confirmDeleteDevice, function() {
 					self.devicesDeleteDevice(deviceId, function(device) {
-						self.devicesRender();
 						popup.dialog('close').remove();
 
 						toastr.success(monster.template(self, '!' + self.i18n.active().devices.deletedDevice, { deviceName: device.name }));
+
+						callbackDelete && callbackDelete(device);
 					});
 				});
 			});
@@ -809,7 +822,7 @@ define(function(require){
 
 		devicesGetEditData: function(dataDevice, callback) {
 			var self = this;
-
+			
 			monster.parallel({
 					listClassifiers: function(callback) {
 						self.devicesListClassifiers(function(dataClassifiers) {

submodules/users/users.js

@@ -989,7 +989,25 @@ define(function(require){
 				});
 			});
 
+
+			template.on('click', '.detail-devices .edit-device-link', function() {
+				var row = $(this).parents('.item-row'),
+					id = row.data('id')
+
+				monster.pub('voip.devices.editDevice', { 
+						data: { id: id }, 
+						callbackSave: function(device) {
+							row.find('.edit-device').html(device.name);
+						},
+						callbackDelete: function(device) {
+							row.remove();
+						}
+					}
+				);
+			});
+
 			template.on('click', '.detail-devices .list-unassigned-items .add-device', function() {
+
 				var row = $(this).parents('.item-row'),
 					spare = template.find('.count-spare'),
 					countSpare = spare.data('count') - 1,

views/users-devices.html

@@ -8,7 +8,7 @@
 				<div class="item-row" data-id="{{this.id}}" data-search="{{ this.name }}">
 					<div class="device">
 						<button type="button" class="btn btn-danger remove-device">{{ ../i18n.remove }}</button>
-						{{ this.name }}
+						<a href="javascript:void(0);" class="edit-device-link monster-link">{{ this.name }}</a>
 					</div>
 				</div>
 			{{else}}
@@ -37,7 +37,7 @@
 				<div class="item-row" data-id="{{this.id}}" data-search="{{this.name}}">
 					<div class="device">
 						<button type="button" class="btn btn-primary add-device">{{ ../i18n.add }}</button>
-						{{ this.name }}
+						<a href="javascript:void(0);" class="edit-device-link monster-link">{{ this.name }}</a>
 					</div>
 				</div>
 			{{/each}}

views/users-rowSpareDevice.html

@@ -1,6 +1,6 @@
 <div class="item-row" data-id="{{this.id}}" data-search="{{this.name}}">
 	<div class="device">
 		<button type="button" class="btn btn-primary add-device">{{ i18n.add }}</button>
-		{{ this.name }}
+		<a href="javascript:void(0);" class="edit-device-link monster-link">{{ this.name }}</a>
 	</div>
 </div>