Browse Source

UI-1855: Fix tooltip bug when buying numbers

4.3
Joris Tirado 10 years ago
parent
commit
46f93c2942
2 changed files with 9 additions and 7 deletions
  1. +6
    -5
      submodules/groups/groups.js
  2. +3
    -2
      submodules/users/users.js

+ 6
- 5
submodules/groups/groups.js View File

@ -1148,7 +1148,7 @@ define(function(require){
template.find('.spare-link').addClass('disabled');
}
}
}
};
monster.pub('common.numbers.dialogSpare', args);
});
@ -1160,16 +1160,15 @@ define(function(require){
searchType: $(this).data('type'),
callbacks: {
success: function(numbers) {
monster.pub('common.numbers.getListFeatures', function(features) {
_.each(numbers, function(number, k) {
number.viewFeatures = $.extend(true, {}, features);
number.phoneNumber = number.id;
var rowTemplate = monster.template(self, 'groups-numbersItemRow', {
var rowTemplate = $(monster.template(self, 'groups-numbersItemRow', {
isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
number: number
});
}));
monster.ui.tooltips(rowTemplate);
@ -1464,7 +1463,9 @@ define(function(require){
number.localityEnabled = 'locality' in number ? true : false;
_.each(number.features, function(feature) {
number.viewFeatures[feature].active = 'active';
if(feature in number.viewFeatures) {
number.viewFeatures[feature].active = 'active';
}
});
if(number.used_by === '') {


+ 3
- 2
submodules/users/users.js View File

@ -1074,6 +1074,7 @@ define(function(require){
template.on('click', '.actions .buy-link', function(e) {
e.preventDefault();
monster.pub('common.buyNumbers', {
searchType: $(this).data('type'),
callbacks: {
@ -1083,10 +1084,10 @@ define(function(require){
number.viewFeatures = $.extend(true, {}, features);
number.phoneNumber = number.id;
var rowTemplate = monster.template(self, 'users-numbersItemRow', {
var rowTemplate = $(monster.template(self, 'users-numbersItemRow', {
isE911Enabled: monster.util.isNumberFeatureEnabled('e911'),
number: number
});
}));
monster.ui.tooltips(rowTemplate);


Loading…
Cancel
Save