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

Merged in bugfix/PMC-1012 (pull request #7004)

Browse Source 
PMC-1012

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Andrea Adamczyk
2019-07-30 13:59:11 +00:00
committed by Julio Cesar Laura Avendaño
parent 78306391a0 f46826d7f0
commit 961aa4c9a4
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/IsoCountry.php
View File

@@ -40,7 +40,7 @@
*/
class IsoCountry extends BaseIsoCountry
{
public function findById($UID)
public static function findById($UID)
{
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoCountryPeer::IC_UID);

2
workflow/engine/classes/model/IsoLocation.php
View File

@@ -40,7 +40,7 @@
*/
class IsoLocation extends BaseIsoLocation
{
public function findById($IC_UID, $IS_UID, $IL_UID)
public static function findById($IC_UID, $IS_UID, $IL_UID)
{
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoLocationPeer::IC_UID);

2
workflow/engine/classes/model/IsoSubdivision.php
View File

@@ -40,7 +40,7 @@
*/
class IsoSubdivision extends BaseIsoSubdivision
{
public function findById($IC_UID, $IS_UID)
public static function findById($IC_UID, $IS_UID)
{
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(IsoSubdivisionPeer::IC_UID);

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

@@ -232,11 +232,10 @@ switch ($_POST['action']) {
$aFields['PREF_DEFAULT_MENUSELECTED'] = '';
$aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = '';
if (sizeof($oConf->Fields) > 0) {
// this user has a configuration record
$aFields['PREF_DEFAULT_LANG'] = $oConf->aConfig['DEFAULT_LANG'];
$aFields['PREF_DEFAULT_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_MENU']) ? $oConf->aConfig['DEFAULT_MENU'] : '';
$aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_CASES_MENU']) ? $oConf->aConfig['DEFAULT_CASES_MENU'] : '';
$aFields['PREF_DEFAULT_LANG'] = isset($oConf->aConfig['DEFAULT_LANG']) ? $oConf->aConfig['DEFAULT_LANG'] : SYS_LANG;
if (isset($oConf->aConfig['DEFAULT_MENU'])) {
$aFields['PREF_DEFAULT_MENUSELECTED'] = $oConf->aConfig['DEFAULT_MENU'];
} else {
switch ($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']) {
case 'PROCESSMAKER_ADMIN':
@@ -246,8 +245,10 @@ switch ($_POST['action']) {
$aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_CASES';
break;
}
$aFields['PREF_DEFAULT_LANG'] = SYS_LANG;
}
$aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_CASES_MENU']) ? $oConf->aConfig['DEFAULT_CASES_MENU'] : '';
if ($aFields['USR_REPLACED_BY'] != '') {
$user = new Users();
$u = $user->load($aFields['USR_REPLACED_BY']);