Merge pull request #729 from julceslauhub/master

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

View File

@@ -445,18 +445,16 @@ 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);
$oDataset = UsersPeer::doSelectRS( $oC ); $oDataset = UsersPeer::doSelectRS($oC);
$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