diff --git a/i18n/en-US.json b/i18n/en-US.json index 364bc97d..7f8bdad1 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -233,7 +233,7 @@ "__version": "3.19", "ignoreCompletedElsewhere": { "label": "Ignore Completed Elsewhere", - "help": "When checked supporting phones will show a call missed if it was part of a ring group answered elsewhere.", + "help": "When turned on, supporting phones will show a call missed if it was part of a ring group answered elsewhere.", "systemDefault": "System Default" }, "__comment": "UI-377: Adding Restart device feature", diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index caf89726..78e002fd 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -743,8 +743,12 @@ define(function(require) { // If value is set to something else than account default then we set the enabled boolean if (value && value !== 'default') { - formData.ignore_completed_elsewhere = value === 'on' + formData.ignore_completed_elsewhere = value === 'on'; + return; } + + delete formData.ignore_completed_elsewhere; + delete originalData.ignore_completed_elsewhere; }); if ('mac_address' in formData) { @@ -1185,10 +1189,10 @@ define(function(require) { softphone: _.merge({}, sipSettings), teammate: _.merge({ caller_id_options: { - outbound_privacy: "none" + outbound_privacy: 'none' }, sip: _.merge({ - ignore_completed_elsewhere: 'true', + ignore_completed_elsewhere: false }, _.pick(sipSettings.sip, ['password', 'username'])), media: { webrtc: false, @@ -1511,6 +1515,8 @@ define(function(require) { self.updateMobileCallflowAssignment(userId, userMainCallflowId, device, callback); }, saveDevice = function saveDevice(device, callback) { + delete device.system_ignore_completed_elsewhere; + var method = _.has(device, 'id') ? 'devicesUpdateDevice' : 'devicesCreateDevice'; self[method](device, _.partial(callback, null), callback); diff --git a/submodules/devices/devices.scss b/submodules/devices/devices.scss index 9e9bde88..71193599 100644 --- a/submodules/devices/devices.scss +++ b/submodules/devices/devices.scss @@ -238,6 +238,11 @@ margin-left: 22px; } +.voip-edit-device-popup .edit-device .ignore-completed-elsewhere-group { + display: flex; + align-items: center; +} + .voip-edit-device-popup .edit-device .actions { border-top: 1px solid #CCCCCC; height: 30px; diff --git a/submodules/devices/views/devices-mobile.html b/submodules/devices/views/devices-mobile.html index 6a4cea06..af2fd710 100644 --- a/submodules/devices/views/devices-mobile.html +++ b/submodules/devices/views/devices-mobile.html @@ -198,13 +198,16 @@ {{ i18n.devices.popupSettings.miscellaneous.sectionTitle }} -
-