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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	workflow/engine/classes/class.processMap.php
	workflow/engine/classes/model/AdditionalTables.php
This commit is contained in:
Erik Amaru Ortiz
2014-04-02 09:34:54 -04:00
parent e5e62da380 92947e646a
commit 7a47472ea1
60 changed files with 597 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/controllers/adminProxy.php
View File

@@ -135,6 +135,7 @@ class adminProxy extends HttpProxyController
$list = $data;
}
$oRoles = new Roles();
$rows = array();
foreach ($list as $value) {
@@ -144,6 +145,13 @@ class adminProxy extends HttpProxyController
$user->save();
$row = $user->toArray(BasePeer::TYPE_FIELDNAME);
try {
$uRole = $oRoles->loadByCode($row['USR_ROLE']);
} catch (exception $oError) {
$uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' );
}
$row['USR_ROLE_ID'] = $row['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
$uxList = self::getUxTypesList();
$row['USR_UX'] = $uxList[$user->getUsrUx()];