fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-1701

Browse Source 
Admin->Users. Al crear un nuevo Usuario el campo Default Main Menu Option no guarda el valor seleccionado. Cuando se pretende editar ese campo aparece con otro valor.
This commit is contained in:
Dheeyi William
2016-08-26 14:56:21 -04:00
parent b29ae05bca
commit 1f2e99e4fa
2 changed files with 55 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -69,7 +69,7 @@ class User
'USR_LOGGED_NEXT_TIME' => 'PM_EDIT_USER_PROFILE_USER_MUST_CHANGE_PASSWORD_AT_NEXT_LOGON',
'USR_PHOTO' => 'PM_EDIT_USER_PROFILE_PHOTO',
'PREF_DEFAULT_MENUSELECTED' => 'PM_EDIT_USER_PROFILE_DEFAULT_MAIN_MENU_OPTIONS',
'PREF_DEFAULT_CASESELECTED' => 'PM_EDIT_USER_PROFILE_DEFAULT_CASES_MENU_OPTIONS'
'PREF_DEFAULT_CASES_MENUSELECTED' => 'PM_EDIT_USER_PROFILE_DEFAULT_CASES_MENU_OPTIONS'
);
/**

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

@@ -803,6 +803,7 @@ Ext.onReady(function () {
comboDefaultMainMenuOption.on('select', function (cmb, record, index) {
comboDefaultCasesMenuOption.disable();
if (record.get('id') == 'PM_CASES') {
comboDefaultCasesMenuOption.setReadOnly(false);
comboDefaultCasesMenuOption.enable();
}
}, this);
@@ -1411,21 +1412,11 @@ function loadData()
comboLanguage.store.load();
/*----------------------------------********---------------------------------*/
comboDefaultMainMenuOption.store.on("load", function (store) {
comboDefaultMainMenuOption.setValue(store.getAt(0).get("id"));
});
storeDefaultMainMenuOption.load();
comboDefaultCasesMenuOption.store.on("load", function (store) {
comboDefaultCasesMenuOption.setValue(store.getAt(0).get("id"));
});
storeDefaultCasesMenuOption.load();
setPreferencesData(false, null);
}
//Load data for Edit mode
function loadUserData()
{
function loadUserData() {
Ext.Ajax.request({
url: "usersAjax",
method: "POST",
@@ -1528,31 +1519,7 @@ function loadUserData()
comboLanguage.setValue(data.user.USR_DEFAULT_LANG);
});
/*----------------------------------********---------------------------------*/
if (infoMode) {
comboDefaultMainMenuOption.store.on("load", function (store) {
comboDefaultMainMenuOption.setValue(data.user.PREF_DEFAULT_MENUSELECTED);
storeDefaultCasesMenuOption.load();
});
comboDefaultCasesMenuOption.store.on("load", function (store) {
if (comboDefaultMainMenuOption.getValue() == 'PM_CASES') {
comboDefaultCasesMenuOption.enable();
}
comboDefaultCasesMenuOption.setValue(data.user.PREF_DEFAULT_CASES_MENUSELECTED);
});
} else {
comboDefaultMainMenuOption.store.on("load", function (store) {
comboDefaultMainMenuOption.setValue(store.getAt(0).get("id"));
});
comboDefaultCasesMenuOption.store.on("load", function (store) {
comboDefaultCasesMenuOption.setValue(store.getAt(0).get("id"));
});
}
setPreferencesData(true, data);
previousUsername = Ext.getCmp("USR_USERNAME").getValue();
storeCountry.load();
@@ -1577,10 +1544,6 @@ function loadUserData()
/*----------------------------------********---------------------------------*/
storeLanguage.load();
/*----------------------------------********---------------------------------*/
storeDefaultMainMenuOption.load();
//storeDefaultCasesMenuOption.load();
},
failure: function (r, o) {
//viewport.getEl().unmask();
@@ -1588,6 +1551,34 @@ function loadUserData()
});
}
function setPreferencesData(editOrCreate, data) {
if (USR_UID != '' && editOrCreate) {
comboDefaultMainMenuOption.store.on("load", function (store) {
comboDefaultMainMenuOption.setValue(data.user.PREF_DEFAULT_MENUSELECTED);
});
comboDefaultCasesMenuOption.store.on("load", function (store) {
comboDefaultCasesMenuOption.setValue(data.user.PREF_DEFAULT_CASES_MENUSELECTED);
comboDefaultCasesMenuOption.enable();
if (comboDefaultMainMenuOption.getValue() != 'PM_CASES') {
disableAndReadOnly('PREF_DEFAULT_CASES_MENUSELECTED');
}
});
} else {
comboDefaultMainMenuOption.store.on("load", function (store) {
comboDefaultMainMenuOption.setValue(store.getAt(0).get("id"));
});
comboDefaultCasesMenuOption.store.on("load", function (store) {
comboDefaultCasesMenuOption.setValue(store.getAt(0).get("id"));
comboDefaultCasesMenuOption.enable();
if (comboDefaultMainMenuOption.getValue() != 'PM_CASES') {
disableAndReadOnly('PREF_DEFAULT_CASES_MENUSELECTED');
}
});
}
storeDefaultMainMenuOption.load();
storeDefaultCasesMenuOption.load();
}
function userExecuteEvent(element, event)
{
if (document.createEventObject) {