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

Merge pull request #729 from julceslauhub/master

Browse Source 
BUG 9562 If it is the top level of department/manager then "Report To" assignment raises an error SOLVED
This commit is contained in:
julceslauhub
2012-10-12 11:29:41 -07:00
parent 2e4636ef6b ca88226069
commit f93c83316e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.derivation.php
View File

@@ -445,10 +445,8 @@ class Derivation
* @param string $USR_UID * @param string $USR_UID
* @return string $aRow['USR_REPORTS_TO'] * @return string $aRow['USR_REPORTS_TO']
*/ */
function getDenpendentUser ($USR_UID) function getDenpendentUser($USR_UID) {
{ //Here the uid to next user
//require_once 'classes/model/Users.php';
//here the uid to next Users
$oC = new Criteria(); $oC = new Criteria();
$oC->addSelectColumn(UsersPeer::USR_REPORTS_TO); $oC->addSelectColumn(UsersPeer::USR_REPORTS_TO);
$oC->add(UsersPeer::USR_UID, $USR_UID); $oC->add(UsersPeer::USR_UID, $USR_UID);
@@ -456,7 +454,7 @@ class Derivation
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
return $aRow['USR_REPORTS_TO']; return $aRow['USR_REPORTS_TO'] != '' ? $aRow['USR_REPORTS_TO'] : $USR_UID;
} }
/* setTasLastAssigned /* setTasLastAssigned