diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index acc454a48..ef4a285cf 100644 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -406,6 +406,7 @@ switch($_POST['action']) $_SESSION['CURRENT_USER'] = $_POST['USR_UID']; $oUser = new Users(); $aFields = $oUser->loadDetailed($_POST['USR_UID']); + $aFields['USR_STATUS'] = G::LoadTranslation('ID_' . $aFields['USR_STATUS']); //Load Calendar options and falue for this user G::LoadClass ( 'calendar' ); diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index b9d258997..d70d3e7af 100755 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -475,15 +475,15 @@ try { echo '{success: true}'; break; case 'summaryUserData': - require_once 'classes/model/Users.php'; - require_once 'classes/model/Department.php'; - require_once 'classes/model/AppCacheView.php'; - G::LoadClass('configuration'); - $oUser = new Users(); - // $data = $oUser->load($_REQUEST['USR_UID']); - $data = $oUser->loadDetailed($_REQUEST['USR_UID']); - $oAppCache = new AppCacheView(); - $aTypes = Array(); + require_once 'classes/model/Users.php'; + require_once 'classes/model/Department.php'; + require_once 'classes/model/AppCacheView.php'; + G::LoadClass('configuration'); + $oUser = new Users(); + $data = $oUser->loadDetailed($_REQUEST['USR_UID']); + $data['USR_STATUS'] = G::LoadTranslation('ID_' . $data['USR_STATUS']); + $oAppCache = new AppCacheView(); + $aTypes = Array(); $aTypes['to_do'] = 'CASES_INBOX'; $aTypes['draft'] = 'CASES_DRAFT'; $aTypes['cancelled'] = 'CASES_CANCELLED'; diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 1065e4a9f..68ecf22cf 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -344,7 +344,7 @@ Ext.onReady(function () { var status = new Ext.data.SimpleStore({ fields: ["USR_STATUS", "status"], - data: [["ACTIVE", "ACTIVE"], ["INACTIVE", "INACTIVE"], ["VACATION", "ON VACATION"]] + data: [["ACTIVE", _("ID_ACTIVE")], ["INACTIVE", _("ID_INACTIVE")], ["VACATION", _("ID_VACATION")]] }); var comboStatus = new Ext.form.ComboBox({