fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-939

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-02-05 17:52:40 -04:00
parent 297cff0ca9 b1248d74ef
commit f5e00b7112
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -1192,7 +1192,8 @@ Ext.onReady( function() {
params: {
action : 'calendarName',
oldName : fields.OLD_NAME,
name : canlendarName
name : canlendarName,
uid : fields.CALENDAR_UID
},
success: function(resp){
if (resp.responseText != '[]')

13
workflow/engine/templates/users/users.js
View File

@@ -383,15 +383,15 @@ Ext.onReady(function () {
]
})
});
comboRole = new Ext.form.ComboBox({
fieldLabel : _('ID_ROLE'),
hiddenName : 'USR_ROLE',
id : 'USR_ROLE',
readOnly : readMode,
store : storeRole,
store : storeRole,
valueField : 'ROL_UID',
displayField : 'ROL_CODE',
displayField : 'ROL_CODE',
emptyText : TRANSLATIONS.ID_SELECT,
width : 260,
selectOnFocus : true,
@@ -400,7 +400,7 @@ Ext.onReady(function () {
triggerAction : 'all',
mode : 'local'
});
var informationFields = new Ext.form.FieldSet({
title : _('ID_PERSONAL_INFORMATION'),
items : [
@@ -1250,11 +1250,10 @@ function loadData()
comboRole.store.on("load", function (store) {
comboRole.setValue(store.getAt(0).get("ROL_UID"));
});
comboRole.setValue(store.getAt(1).get("ROL_UID"));
});
comboRole.store.load();
comboDefaultMainMenuOption.store.on("load", function (store) {
comboDefaultMainMenuOption.setValue(store.getAt(0).get("id"));
});