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

Merge pull request #547 from julceslauhub/master

Browse Source 
BUG 9742 Untranslatable items in user properties forms SOLVED
This commit is contained in:
julceslauhub
2012-09-11 13:52:27 -07:00
parent 7dac4e52f5 c10bb157b9
commit 1ade653838
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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' );

18
workflow/engine/methods/users/users_Ajax.php
View File

@@ -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';

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

@@ -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({