From e915802b1c6228e85567d00c659db07879711c76 Mon Sep 17 00:00:00 2001 From: Maxime Roux Date: Mon, 23 Feb 2015 16:45:34 -0800 Subject: [PATCH] UI-1219: added the prepend feature everywhere there are number feature management in SmartPBX --- i18n/en-US.json | 6 +++++- submodules/groups/groups.js | 22 ++++++++++++++++++++++ submodules/strategy/strategy.js | 22 ++++++++++++++++++++++ submodules/users/users.js | 22 ++++++++++++++++++++++ views/groups-numbers.html | 5 +++-- views/groups-numbersItemRow.html | 5 +++-- views/strategy-numbers.html | 5 +++-- views/users-numbers.html | 5 +++-- views/users-numbersItemRow.html | 5 +++-- 9 files changed, 86 insertions(+), 11 deletions(-) diff --git a/i18n/en-US.json b/i18n/en-US.json index b2127a6..f264b48 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -887,5 +887,9 @@ "create": "Add New Recipient" } } - } + }, + + "__comment": "UI-1219: Adding the prepend feature to numbers", + "__version": "v3.20_s1", + "numberPrepend": "Prepend" } diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index bb285df..2d47cb6 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -931,6 +931,28 @@ define(function(require){ } }); + template.on('click', '.prepend-number', function() { + var prependCell = $(this).parents('.item-row').first(), + phoneNumber = prependCell.data('id'); + + if(phoneNumber) { + var args = { + phoneNumber: phoneNumber, + callbacks: { + success: function(data) { + if('prepend' in data.data && data.data.prepend.enabled) { + prependCell.find('.features i.feature-prepend').addClass('active'); + } else { + prependCell.find('.features i.feature-prepend').removeClass('active'); + } + } + } + }; + + monster.pub('common.numberPrepend.renderPopup', args); + } + }); + template.on('click', '.actions .spare-link:not(.disabled)', function(e) { e.preventDefault(); diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index 65bbfdc..2c46f47 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -625,6 +625,28 @@ define(function(require){ monster.pub('common.e911.renderPopup', args); } }); + + container.on('click', '.number-element .prepend-number', function() { + var prependCell = $(this).parents('.number-element').first(), + phoneNumber = prependCell.find('.remove-number').data('number'); + + if(phoneNumber) { + var args = { + phoneNumber: phoneNumber, + callbacks: { + success: function(data) { + if('prepend' in data.data && data.data.prepend.enabled) { + prependCell.find('.features i.feature-prepend').addClass('active'); + } else { + prependCell.find('.features i.feature-prepend').removeClass('active'); + } + } + } + }; + + monster.pub('common.numberPrepend.renderPopup', args); + } + }); }, strategyConfNumBindEvents: function(container, strategyData) { diff --git a/submodules/users/users.js b/submodules/users/users.js index d32559d..d444677 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -1053,6 +1053,28 @@ define(function(require){ } }); + template.on('click', '.prepend-number', function() { + var prependCell = $(this).parents('.item-row').first(), + phoneNumber = prependCell.data('id'); + + if(phoneNumber) { + var args = { + phoneNumber: phoneNumber, + callbacks: { + success: function(data) { + if('prepend' in data.data && data.data.prepend.enabled) { + prependCell.find('.features i.feature-prepend').addClass('active'); + } else { + prependCell.find('.features i.feature-prepend').removeClass('active'); + } + } + } + }; + + monster.pub('common.numberPrepend.renderPopup', args); + } + }); + template.on('click', '.feature[data-feature="caller_id"]', function() { self.usersRenderCallerId(currentUser); }); diff --git a/views/groups-numbers.html b/views/groups-numbers.html index 342a77f..deb17d1 100644 --- a/views/groups-numbers.html +++ b/views/groups-numbers.html @@ -7,21 +7,22 @@ {{#each assignedNumbers}}
- {{#unless isLocal}}
- {{/unless}}
{{#each viewFeatures}} diff --git a/views/groups-numbersItemRow.html b/views/groups-numbersItemRow.html index 3000eb4..4764c05 100644 --- a/views/groups-numbersItemRow.html +++ b/views/groups-numbersItemRow.html @@ -1,20 +1,21 @@
- {{#unless number.isLocal}}
- {{/unless}}
{{#each number.viewFeatures}} diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html index 35f8ccc..7427cde 100644 --- a/views/strategy-numbers.html +++ b/views/strategy-numbers.html @@ -7,21 +7,22 @@ {{formatPhoneNumber this.number}}
- {{#unless isLocal}}
- {{/unless}}
{{#each this.features}} diff --git a/views/users-numbers.html b/views/users-numbers.html index 014c990..30bffa5 100644 --- a/views/users-numbers.html +++ b/views/users-numbers.html @@ -7,21 +7,22 @@ {{#each assignedNumbers}}
- {{#unless this.isLocal}}
- {{/unless}}
{{#each this.viewFeatures}} diff --git a/views/users-numbersItemRow.html b/views/users-numbersItemRow.html index 3000eb4..4764c05 100644 --- a/views/users-numbersItemRow.html +++ b/views/users-numbersItemRow.html @@ -1,20 +1,21 @@
- {{#unless number.isLocal}}
- {{/unless}}
{{#each number.viewFeatures}}