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

Add another validation related to the laels for the usesrs status

Browse Source
This commit is contained in:
Julio Cesar Laura
2012-09-13 10:36:02 -04:00
parent a573db76ae
commit 52f5100416
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/methods/users/usersAjax.php
View File

@@ -406,7 +406,6 @@ switch($_POST['action'])
$_SESSION['CURRENT_USER'] = $_POST['USR_UID']; $_SESSION['CURRENT_USER'] = $_POST['USR_UID'];
$oUser = new Users(); $oUser = new Users();
$aFields = $oUser->loadDetailed($_POST['USR_UID']); $aFields = $oUser->loadDetailed($_POST['USR_UID']);
$aFields['USR_STATUS'] = G::LoadTranslation('ID_' . $aFields['USR_STATUS']);
//Load Calendar options and falue for this user //Load Calendar options and falue for this user
G::LoadClass ( 'calendar' ); G::LoadClass ( 'calendar' );

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

@@ -1161,7 +1161,7 @@ function loadUserData()
USR_POSITION : data.user.USR_POSITION, USR_POSITION : data.user.USR_POSITION,
USR_DUE_DATE : data.user.USR_DUE_DATE, USR_DUE_DATE : data.user.USR_DUE_DATE,
USR_STATUS : data.user.USR_STATUS USR_STATUS : data.user.USR_STATUS
}) });
if (infoMode) { if (infoMode) {
Ext.getCmp("USR_FIRSTNAME2").setText(data.user.USR_FIRSTNAME); Ext.getCmp("USR_FIRSTNAME2").setText(data.user.USR_FIRSTNAME);
@@ -1179,7 +1179,7 @@ function loadUserData()
Ext.getCmp("USR_POSITION2").setText(data.user.USR_POSITION); Ext.getCmp("USR_POSITION2").setText(data.user.USR_POSITION);
Ext.getCmp("USR_REPLACED_BY2").setText(data.user.REPLACED_NAME); Ext.getCmp("USR_REPLACED_BY2").setText(data.user.REPLACED_NAME);
Ext.getCmp("USR_DUE_DATE2").setText(data.user.USR_DUE_DATE); Ext.getCmp("USR_DUE_DATE2").setText(data.user.USR_DUE_DATE);
Ext.getCmp("USR_STATUS2").setText(data.user.USR_STATUS); Ext.getCmp("USR_STATUS2").setText(_('ID_' + data.user.USR_STATUS));
Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE); Ext.getCmp("USR_ROLE2").setText(data.user.USR_ROLE);
Ext.getCmp("PREF_DEFAULT_MAIN_MENU_OPTION2").setText(data.user.MENUSELECTED_NAME); Ext.getCmp("PREF_DEFAULT_MAIN_MENU_OPTION2").setText(data.user.MENUSELECTED_NAME);