Browse Source

UI-2598: fixed issue with ringing timeout when set to 0

4.3
Jean-Roch Maitre 9 years ago
parent
commit
ba4b855923
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      submodules/users/users.js
  2. +5
    -1
      views/users-name.html

+ 1
- 1
submodules/users/users.js View File

@ -2541,7 +2541,7 @@ define(function(require) {
var dataTemplate = self.usersFormatUserData(userData, results.mainDirectory, results.mainCallflow, results.vmboxes.userVM, results.vmboxes.listExisting),
template = $(monster.template(self, 'users-name', dataTemplate));
console.log(dataTemplate);
monster.ui.validate(template.find('form.user-fields'), {
rules: {
'extra.ringingTimeout': {


+ 5
- 1
views/users-name.html View File

@ -81,7 +81,11 @@
<div class="row-fields">
<div class="fa fa-wrapper" data-original-title="{{i18n.users.editionForm.ringingHelp}}" data-placement="top" data-toggle="tooltip"><i class="fa fa-bell-o"></i></div>
{{#unless extra.ringingTimeout}}
<div class="ringing-timeout disabled" data-original-title="{{i18n.users.editionForm.disabledTimeoutHint}}" data-placement="top" data-toggle="tooltip">
{{#compare extra.ringingTimeout "===" 0}}
<div class="ringing-timeout">
{{else}}
<div class="ringing-timeout disabled" data-original-title="{{i18n.users.editionForm.disabledTimeoutHint}}" data-placement="top" data-toggle="tooltip">
{{/compare}}
{{else}}
{{#if extra.groupTimeout}}
<div class="ringing-timeout disabled" data-original-title="{{i18n.users.editionForm.timeoutEditHint}}" data-placement="top" data-toggle="tooltip">


Loading…
Cancel
Save