Browse Source

UI-1979: Fixed an error when updating Main Number e911

4.3
Jean-Roch Maitre 10 years ago
parent
commit
561bbd4cb3
1 changed files with 11 additions and 6 deletions
  1. +11
    -6
      submodules/myOffice/myOffice.js

+ 11
- 6
submodules/myOffice/myOffice.js View File

@ -919,7 +919,7 @@ define(function(require){
}); });
}); });
}, },
setCallerId = function () {
setNumberData = function (e911Data) {
var callerIdName = callerIdNameInput.val(); var callerIdName = callerIdNameInput.val();
account.caller_id = $.extend(true, {}, account.caller_id, { account.caller_id = $.extend(true, {}, account.caller_id, {
@ -938,6 +938,12 @@ define(function(require){
delete numberData.cnam; delete numberData.cnam;
} }
if(e911Data) {
$.extend(true, numberData, {
dash_e911: e911Data
});
}
self.myOfficeUpdateNumber(numberData, function(data) { self.myOfficeUpdateNumber(numberData, function(data) {
updateAccount(); updateAccount();
}); });
@ -951,19 +957,18 @@ define(function(require){
if(callerIdNumber) { if(callerIdNumber) {
if (monster.util.isNumberFeatureEnabled('e911')) { if (monster.util.isNumberFeatureEnabled('e911')) {
if (monster.ui.valid(e911Form)) { if (monster.ui.valid(e911Form)) {
$.extend(true, numberData, {
dash_e911: monster.ui.getFormData(e911Form[0])
});
var e911Data = monster.ui.getFormData(e911Form[0]);
setCallerId();
setNumberData(e911Data);
} }
else { else {
monster.ui.alert(self.i18n.active().myOffice.callerId.mandatoryE911Alert); monster.ui.alert(self.i18n.active().myOffice.callerId.mandatoryE911Alert);
} }
} }
else { else {
setCallerId();
setNumberData();
} }
} else { } else {
delete account.caller_id.external; delete account.caller_id.external;


Loading…
Cancel
Save