Browse Source

UI-2100: fix smart pbx validations

4.3
Jean-Roch Maitre 10 years ago
parent
commit
adaaaf9722
4 changed files with 14 additions and 4 deletions
  1. +1
    -1
      submodules/devices/devices.js
  2. +5
    -3
      submodules/groups/groups.css
  3. +4
    -0
      submodules/groups/groups.js
  4. +4
    -0
      submodules/users/users.js

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

@ -359,7 +359,7 @@ define(function(require){
monster.ui.protectField(templateDevice.find('#sip_password'), templateDevice);
monster.ui.tooltips(templateDevice);
templateDevice.find('#mac_address').mask("hh:hh:hh:hh:hh:hh", { placeholder:" " });
templateDevice.find('#mac_address').mask('FF:FF:FF:FF:FF:FF', {translation: {"F": { pattern:/[A-Fa-f0-9]/ }}});
templateDevice.find('.chosen-feature-key-user').chosen({ search_contains: true, width: 'inherit' });
if(!(data.media.encryption.enforce_security)) {


+ 5
- 3
submodules/groups/groups.css View File

@ -338,6 +338,11 @@
white-space: nowrap;
}
#groups_container .list-wrapper .item-row .input-extension {
margin: 0 5px 2px 5px;
width: 50px;
}
#groups_container .list-wrapper .item-row > * {
display: inline-block;
padding: 10px;
@ -347,10 +352,7 @@
#groups_container .list-wrapper .item-row button {
margin-right: 15px;
padding: 2px;
width: 80px;
}
#groups_container .list-wrapper .empty-search-row,
#groups_container .list-wrapper .empty-row {
display: none;


+ 4
- 0
submodules/groups/groups.js View File

@ -275,6 +275,8 @@ define(function(require){
monster.ui.validate(groupForm);
groupForm.find('#inputExtension').mask('99ZZZZZZZZZZZZZZ', {translation: {'Z': {pattern: /[0-9]/, optional: true}}});
groupTemplate.find('#create_group').on('click', function() {
if(monster.ui.valid(groupForm)) {
var formattedData = self.groupsCreationMergeData(data, groupTemplate);
@ -1248,6 +1250,8 @@ define(function(require){
newLineTemplate = $(monster.template(self, 'groups-newExtension', dataTemplate)),
$listExtensions = template.find('.list-assigned-items');
newLineTemplate.find('.input-extension').mask('99ZZZZZZZZZZZZZZ', {translation: {'Z': {pattern: /[0-9]/, optional: true}}});
listExtension.push(lastExtension);
$listExtensions.find('.empty-row').hide();


+ 4
- 0
submodules/users/users.js View File

@ -587,6 +587,8 @@ define(function(require){
var originalData = self.usersFormatAddUser(results),
userTemplate = $(monster.template(self, 'users-creation', originalData));
userTemplate.find('#extension').mask('99ZZZZZZZZZZZZZZ', {translation: {'Z': {pattern: /[0-9]/, optional: true}}});
monster.ui.validate(userTemplate.find('#form_user_creation'), {
rules: {
'callflow.extension': {
@ -717,6 +719,8 @@ define(function(require){
newLineTemplate = $(monster.template(self, 'users-newExtension', dataTemplate)),
listExtensions = template.find('.extensions .list-assigned-items');
newLineTemplate.find('.input-extension ').mask('99ZZZZZZZZZZZZZZ', {translation: {'Z': {pattern: /[0-9]/, optional: true}}});
listExtensions.find('.empty-row').hide();
listExtensions.append(newLineTemplate);


Loading…
Cancel
Save