From cdaade885dac42b975b38460d0ec14bb3f2d2062 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Wed, 15 Apr 2015 16:55:35 -0700 Subject: [PATCH] UI-1351: Use 'extra' object to store feature key data --- submodules/devices/devices.js | 38 +++++++++--------- views/devices-sip_device.html | 72 +++++++++++++++++------------------ 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index f1285d7..0a52017 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -157,20 +157,16 @@ define(function(require){ }; self.devicesGetEditData(data, function(dataDevice) { - var args = { - device: dataDevice - }; - - if (args.device.hasOwnProperty('provision')) { - self.devicesGetIterator(args.device.provision, function(template) { + if (dataDevice.hasOwnProperty('provision')) { + self.devicesGetIterator(dataDevice.provision, function(template) { if (template.hasOwnProperty('feature_keys')) { - if (!args.device.provision.hasOwnProperty('feature_keys')) { - args.device.provision.feature_keys = {}; + if (!dataDevice.provision.hasOwnProperty('feature_keys')) { + dataDevice.provision.feature_keys = {}; } for (var i = 0, len = template.feature_keys.iterate - 1; i < len; i++) { - if (!args.device.provision.feature_keys.hasOwnProperty(i)) { - args.device.provision.feature_keys[i] = { type: 'none' }; + if (!dataDevice.provision.feature_keys.hasOwnProperty(i)) { + dataDevice.provision.feature_keys[i] = { type: 'none' }; } } @@ -181,7 +177,8 @@ define(function(require){ }, success: function(data, status) { var keyTypes = [ 'none', 'presence', 'parking', 'personal_parking', 'speed_dial' ], - parkingSpots = []; + parkingSpots = [], + extra; data.data.sort(function(a, b) { return a.last_name.toLowerCase() > b.last_name.toLowerCase() ? 1 : -1; @@ -199,27 +196,29 @@ define(function(require){ } }); - $.extend(true, args, { + extra = { users: data.data, featureKeys:{ parkingSpots: parkingSpots, types: keyTypes } - }); + }; + + dataDevice.extra = dataDevice.hasOwnProperty(extra) ? $.extend(true, {}, dataDevice.extra, extra) : extra; - self.devicesRenderDevice(args, callbackSave, callbackDelete); + self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete); } }); } else { - self.devicesRenderDevice(args, callbackSave, callbackDelete); + self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete); } }, function() { - self.devicesRenderDevice(args, callbackSave, callbackDelete); + self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete); }); } else { - self.devicesRenderDevice(args, callbackSave, callbackDelete); + self.devicesRenderDevice(dataDevice, callbackSave, callbackDelete); } }); }, @@ -262,13 +261,12 @@ define(function(require){ } }, - devicesRenderDevice: function(args, callbackSave, callbackDelete) { + devicesRenderDevice: function(data, callbackSave, callbackDelete) { var self = this, - data = args.device, mode = data.id ? 'edit' : 'add', type = data.device_type, popupTitle = mode === 'edit' ? monster.template(self, '!' + self.i18n.active().devices[type].editTitle, { name: data.name }) : self.i18n.active().devices[type].addTitle; - templateDevice = $(monster.template(self, 'devices-'+type, args)), + templateDevice = $(monster.template(self, 'devices-'+type, data)), deviceForm = templateDevice.find('#form_device'); if (data.hasOwnProperty('provision') && data.provision.hasOwnProperty('feature_keys')) { diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html index 9a4c224..ee127f6 100644 --- a/views/devices-sip_device.html +++ b/views/devices-sip_device.html @@ -1,16 +1,16 @@ -
+
- {{#if device.provision}} -
-
{{device.provision.endpoint_brand}} - {{device.provision.endpoint_model}}
+ {{#if provision}} +
+
{{provision.endpoint_brand}} - {{provision.endpoint_model}}
{{else}}
- {{#if device.id}} -
{{device.name}}
+ {{#if id}} +
{{name}}
{{else}}
{{i18n.devices.sip_device.new}}
{{/if}} @@ -26,7 +26,7 @@ @@ -48,41 +48,41 @@
- +
- {{#if device.provision}} + {{#if provision}}
- +
{{else}}
- +
- +
- {{ device.sip.realm }} + {{ sip.realm }}
{{/if}}
- {{#if device.provision}} + {{#if provision}}
{{ i18n.devices.popupSettings.sip.sectionTitle }} @@ -90,21 +90,21 @@
- +
- +
- {{ device.sip.realm }} + {{ sip.realm }}
@@ -144,7 +144,7 @@ {{ i18n.devices.popupSettings.restrictions.sectionTitle }}
- {{#each device.extra.restrictions}} + {{#each extra.restrictions}}
- {{#if device.extra.hasDisabledRestrictions}} + {{#if extra.hasDisabledRestrictions}}
   @@ -182,14 +182,14 @@ {{ i18n.devices.popupSettings.callerId.sectionTitle }}
- {{#if device.extra.hasE911Numbers}} + {{#if extra.hasE911Numbers}}
@@ -220,7 +220,7 @@
@@ -230,7 +230,7 @@
@@ -239,14 +239,14 @@ {{ i18n.devices.popupSettings.miscellaneous.rtp.type }}
- {{#if device.provision.feature_keys}} + {{#if provision.feature_keys}}
{{ i18n.devices.popupSettings.featureKeys.menuTitle }} @@ -254,12 +254,12 @@
{{ i18n.devices.popupSettings.featureKeys.info.link.showInfo }}
- {{#each featureKeys.types}} + {{#each extra.featureKeys.types}}

{{#if info}}{{text}}: {{info}}{{/if}}

{{/each}}
- {{#each device.provision.feature_keys}} + {{#each provision.feature_keys}}