Merged in victorsl/processmaker/PM-2412 (pull request #2061)

PM-2412 "Admin>Settings>Users: En Internet Explorer No se visualiza..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-30 18:15:54 -04:00

View File

@@ -1,6 +1,6 @@
var storeCountry; var storeCountry;
var storeRegion; var storeRegion;
var storeLocation; var storeLocation;
var storeReplacedBy; var storeReplacedBy;
var storeCalendar; var storeCalendar;
var storeRole; var storeRole;
@@ -389,9 +389,9 @@ Ext.onReady(function () {
hiddenName : 'USR_ROLE', hiddenName : 'USR_ROLE',
id : 'USR_ROLE', id : 'USR_ROLE',
readOnly : readMode, readOnly : readMode,
store : storeRole, store : storeRole,
valueField : 'ROL_UID', valueField : 'ROL_UID',
displayField : 'ROL_CODE', displayField : 'ROL_CODE',
emptyText : TRANSLATIONS.ID_SELECT, emptyText : TRANSLATIONS.ID_SELECT,
width : 260, width : 260,
selectOnFocus : true, selectOnFocus : true,
@@ -414,7 +414,7 @@ Ext.onReady(function () {
'change': function(field, newVal, oldVal){ 'change': function(field, newVal, oldVal){
var fname = newVal.replace(/^\s+/,'').replace(/\s+$/,''); var fname = newVal.replace(/^\s+/,'').replace(/\s+$/,'');
field.setValue(fname.trim()); field.setValue(fname.trim());
} }
} }
}, },
{ {
@@ -427,7 +427,7 @@ Ext.onReady(function () {
'change': function(field, newVal, oldVal){ 'change': function(field, newVal, oldVal){
var lname = newVal.replace(/^\s+/,'').replace(/\s+$/,''); var lname = newVal.replace(/^\s+/,'').replace(/\s+$/,'');
field.setValue(lname.trim()); field.setValue(lname.trim());
} }
} }
}, },
{ {
@@ -657,7 +657,7 @@ Ext.onReady(function () {
] ]
}); });
var accountOptions = new Ext.form.FieldSet({ var accountOptions = new Ext.form.FieldSet({
title: _('ID_ACCOUNT_OPTIONS'), title: _('ID_ACCOUNT_OPTIONS'),
items: [{ items: [{
@@ -670,7 +670,7 @@ Ext.onReady(function () {
uncheckedValue: 0 uncheckedValue: 0
}] }]
}); });
storeDefaultMainMenuOption = new Ext.data.Store({ storeDefaultMainMenuOption = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({ proxy: new Ext.data.HttpProxy({
url: "usersAjax", url: "usersAjax",
@@ -925,7 +925,7 @@ Ext.onReady(function () {
fieldLabel : _('ID_ROLE'), fieldLabel : _('ID_ROLE'),
xtype : 'label', xtype : 'label',
width : 260 width : 260
}, }
] ]
}); });
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
@@ -1312,7 +1312,7 @@ function loadData()
comboRole.store.on("load", function (store) { comboRole.store.on("load", function (store) {
comboRole.setValue(store.getAt(1).get("ROL_UID")); comboRole.setValue(store.getAt(1).get("ROL_UID"));
}); });
comboRole.store.load(); comboRole.store.load();
comboDefaultMainMenuOption.store.on("load", function (store) { comboDefaultMainMenuOption.store.on("load", function (store) {