Browse Source

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

4.3
Joris Tirado 10 years ago
parent
commit
8fb3e7b1b9
3 changed files with 37 additions and 23 deletions
  1. +31
    -21
      submodules/groups/groups.js
  2. +3
    -1
      views/groups-numbers.html
  3. +3
    -1
      views/groups-numbersItemRow.html

+ 31
- 21
submodules/groups/groups.js View File

@ -426,7 +426,9 @@ define(function(require){
self.groupsGetNumbersData(groupId, function(data) {
self.groupsFormatNumbersData(data, function(data) {
template = $(monster.template(self, 'groups-numbers', data));
template = $(monster.template(self, 'groups-numbers', $.extend(true, {}, data, {
isE911Enabled: monster.util.isNumberFeatureEnabled('e911')
})));
self.groupsBindNumbers(template, data);
@ -1038,28 +1040,30 @@ define(function(require){
}
});
template.on('click', '.e911-number', function() {
var e911Cell = $(this).parents('.item-row').first(),
phoneNumber = e911Cell.data('id');
if (monster.util.isNumberFeatureEnabled('e911')) {
template.on('click', '.e911-number', function() {
var e911Cell = $(this).parents('.item-row').first(),
phoneNumber = e911Cell.data('id');
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);
}
});
}
template.on('click', '.callerId-number', function() {
var cnamCell = $(this).parents('.item-row').first(),
@ -1130,7 +1134,10 @@ define(function(require){
template
.find('.list-assigned-items')
.append($(monster.template(self, 'groups-numbersItemRow', { number: val })));
.append($(monster.template(self, 'groups-numbersItemRow', {
isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
number: val
})));
extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
});
@ -1159,7 +1166,10 @@ define(function(require){
number.viewFeatures = $.extend(true, {}, features);
number.phoneNumber = number.id;
var rowTemplate = monster.template(self, 'groups-numbersItemRow', { number: number });
var rowTemplate = monster.template(self, 'groups-numbersItemRow', {
isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
number: number
});
monster.ui.tooltips(rowTemplate);


+ 3
- 1
views/groups-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>


+ 3
- 1
views/groups-numbersItemRow.html View File

@ -8,7 +8,9 @@
<ul class="dropdown-menu">
{{#unless number.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