Browse Source

UI-1855: On Main Number management, hide e911 feature when disabled on the account

4.3
Joris Tirado 10 years ago
parent
commit
3cf3b280f9
2 changed files with 26 additions and 20 deletions
  1. +23
    -19
      submodules/strategy/strategy.js
  2. +3
    -1
      views/strategy-numbers.html

+ 23
- 19
submodules/strategy/strategy.js View File

@ -399,6 +399,7 @@ define(function(require){
return ret;
}
}),
isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
spareLinkEnabled: (_.countBy(accountNumbers, function(number) {return number.used_by ? 'assigned' : 'spare';})['spare'] > 0)
},
template = $(monster.template(self, 'strategy-'+templateName, templateData));
@ -750,9 +751,10 @@ define(function(require){
var $this = $(this),
numberToRemove = $this.data('number'),
e911Feature = $this.data('e911'),
isE911Enabled = monster.util.isNumberFeatureEnabled('e911'),
indexToRemove = strategyData.callflows["MainCallflow"].numbers.indexOf(numberToRemove.toString());
if(e911Feature === 'active' && container.find('.number-element .remove-number[data-e911="active"]').length === 1) {
if(e911Feature === 'active' && container.find('.number-element .remove-number[data-e911="active"]').length === 1 && isE911Enabled) {
monster.ui.alert('error', self.i18n.active().strategy.alertMessages.lastE911Error);
} else if(indexToRemove >= 0) {
self.strategyGetNumber(numberToRemove, function(dataNumber) {
@ -871,28 +873,30 @@ define(function(require){
}
});
container.on('click', '.number-element .e911-number', function() {
var e911Cell = $(this).parents('.number-element').first(),
phoneNumber = e911Cell.find('.remove-number').data('number');
if (monster.util.isNumberFeatureEnabled('e911')) {
container.on('click', '.number-element .e911-number', function() {
var e911Cell = $(this).parents('.number-element').first(),
phoneNumber = e911Cell.find('.remove-number').data('number');
if(phoneNumber) {
var args = {
phoneNumber: phoneNumber,
callbacks: {
success: function(data) {
if(!($.isEmptyObject(data.data.dash_e911))) {
e911Cell.find('.features i.feature-dash_e911').addClass('active');
}
else {
e911Cell.find('.features i.feature-dash_e911').removeClass('active');
if(phoneNumber) {
var args = {
phoneNumber: phoneNumber,
callbacks: {
success: function(data) {
if(!($.isEmptyObject(data.data.dash_e911))) {
e911Cell.find('.features i.feature-dash_e911').addClass('active');
}
else {
e911Cell.find('.features i.feature-dash_e911').removeClass('active');
}
}
}
}
};
};
monster.pub('common.e911.renderPopup', args);
}
});
monster.pub('common.e911.renderPopup', args);
}
});
}
container.on('click', '.number-element .prepend-number', function() {
var prependCell = $(this).parents('.number-element').first(),


+ 3
- 1
views/strategy-numbers.html View File

@ -15,7 +15,9 @@
<ul class="dropdown-menu">
{{#unless isLocal}}
<li><a class="callerId-number" href="#"><i class="fa fa-user"></i>{{ ../../i18n.callerId }}</a></li>
<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../i18n.e911 }}</a></li>
{{#if ../../isE911Enabled}}
<li><a class="e911-number" href="#"><i class="fa fa-ambulance"></i>{{ ../../../i18n.e911 }}</a></li>
{{/if}}
{{/unless}}
<li><a class="prepend-number" href="#"><i class="fa fa-file-text-o"></i>{{ ../i18n.numberPrepend }}</a></li>
</ul>


Loading…
Cancel
Save