Merge remote branch 'upstream/master'
This commit is contained in:
@@ -445,18 +445,16 @@ class Derivation
|
||||
* @param string $USR_UID
|
||||
* @return string $aRow['USR_REPORTS_TO']
|
||||
*/
|
||||
function getDenpendentUser ($USR_UID)
|
||||
{
|
||||
//require_once 'classes/model/Users.php';
|
||||
//here the uid to next Users
|
||||
function getDenpendentUser($USR_UID) {
|
||||
//Here the uid to next user
|
||||
$oC = new Criteria();
|
||||
$oC->addSelectColumn( UsersPeer::USR_REPORTS_TO );
|
||||
$oC->add( UsersPeer::USR_UID, $USR_UID );
|
||||
$oDataset = UsersPeer::doSelectRS( $oC );
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oC->addSelectColumn(UsersPeer::USR_REPORTS_TO);
|
||||
$oC->add(UsersPeer::USR_UID, $USR_UID);
|
||||
$oDataset = UsersPeer::doSelectRS($oC);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
$aRow = $oDataset->getRow();
|
||||
return $aRow['USR_REPORTS_TO'];
|
||||
return $aRow['USR_REPORTS_TO'] != '' ? $aRow['USR_REPORTS_TO'] : $USR_UID;
|
||||
}
|
||||
|
||||
/* setTasLastAssigned
|
||||
|
||||
Reference in New Issue
Block a user