Browse Source

[4.3] MSPB-108: Avaya customizations (#220)

* Make device model uppercase in edit device form

* Set default line keys per brand for edited device

* Add german translation for new save option
4.3
Fernando González 6 years ago
committed by GitHub
parent
commit
90596c64ef
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 6 deletions
  1. +1
    -0
      i18n/de-DE.json
  2. +1
    -1
      i18n/en-US.json
  3. +8
    -2
      submodules/devices/devices.js
  4. +4
    -0
      submodules/devices/devices.scss
  5. +3
    -3
      submodules/devices/views/devices-sip_device.html

+ 1
- 0
i18n/de-DE.json View File

@ -164,6 +164,7 @@
"basicTitle": "Allgemeine Einstellungen",
"basicSectionTitle": "Allgemeine Einstellungen",
"dragAndDrop": "Um einen Codec auszuwählen, ziehen Sie diesen aus dem Feld „Verfügbare Codecs“ in das Feld „Ausgewählte Codecs“.",
"saveAndApply": "Speichern und anwenden",
"options": {
"menuTitle": "Optionen"
},


+ 1
- 1
i18n/en-US.json View File

@ -297,7 +297,7 @@
"keys": {
"alert": {
"message": "By default, this key will be used as a Line Key. It is strongly recommended that you not change it.",
"title": "Key 1 Default"
"title": "Key {{variable}} Default"
},
"featureKeys": {
"menuTitle": "Feature Keys",


+ 8
- 2
submodules/devices/devices.js View File

@ -940,6 +940,11 @@ define(function(require) {
['brands', _.get(data.device, 'provision.endpoint_brand'), 'keyFunctions'],
[]
),
defaultLineKeys = _.get(
self.appFlags.devices.provisionerConfigFlags,
['brands', _.get(data.device, 'provision.endpoint_brand'), 'lineKeys'],
[1]
),
isClassifierDisabledByAccount = function isClassifierDisabledByAccount(classifier) {
return _.get(data.accountLimits, ['call_restriction', classifier, 'action']) === 'deny';
},
@ -1066,6 +1071,7 @@ define(function(require) {
return _.merge({
id: type,
type: camelCasedType,
lineKeys: defaultLineKeys,
actions: _
.chain([
'presence',
@ -1096,10 +1102,10 @@ define(function(require) {
: a.label.localeCompare(b.label, monster.config.whitelabel.language);
})
.value(),
data: _.map(entries, function(metadata) {
data: _.map(entries, function(metadata, idx) {
var value = _.get(metadata, 'value', {});
return _.merge({}, metadata, _.isPlainObject(value)
return _.merge({ keyNumber: idx + 1 }, metadata, _.isPlainObject(value)
? {}
: {
value: {


+ 4
- 0
submodules/devices/devices.scss View File

@ -254,6 +254,10 @@
padding: 15px 0;
}
.voip-edit-device-popup .edit-device .device-title .device-model {
text-transform: uppercase;
}
.voip-edit-device-popup .edit-device .title-bar .device-title > div {
float: left;
font-size: 18px;


+ 3
- 3
submodules/devices/views/devices-sip_device.html View File

@ -348,13 +348,13 @@
</div>
<div class="section-content">
{{#each data}}
<div class="control-group{{#compare ../id '===' 'combo_keys'}}{{#if @first}} warning{{/if}}{{/compare}}" data-id="{{@index}}">
<div class="control-group{{#compare ../id '===' 'combo_keys'}}{{#ifInArray keyNumber ../lineKeys}} warning{{/ifInArray}}{{/compare}}" data-id="{{@index}}">
<label for="provision.keys.{{../id}}[{{@index}}].type" class="control-label">
{{telicon 'drag-handle' class='drag-handle-icon'}}
<span>{{ ../label }}</span> <span class="feature-key-index">{{@index}}</span>
<span>{{ ../label }} {{keyNumber}}</span>
</label>
{{#compare ../id '===' 'combo_keys'}}
{{#monsterPanelText @root.i18n.devices.popupSettings.keys.alert.title 'warning' 'fill-width'}}
{{#monsterPanelText (replaceVar @root.i18n.devices.popupSettings.keys.alert.title keyNumber) 'warning' 'fill-width'}}
{{@root.i18n.devices.popupSettings.keys.alert.message}}
{{/monsterPanelText}}
{{/compare}}


Loading…
Cancel
Save