diff --git a/inc/issue.class.php b/inc/issue.class.php index 9c8888bc3..eab08084f 100644 --- a/inc/issue.class.php +++ b/inc/issue.class.php @@ -576,22 +576,31 @@ static function getAllStatusArray($withmetaforsearch = false) { } static function getIncomingCriteria() { + $currentUser = Session::getLoginUserID(); return ['criteria' => [['field' => 4, 'searchtype' => 'equals', 'value' => 'process', - 'value' => 'notold']], + 'value' => 'notold'], + ['field' => 8, + 'searchtype' => 'equals', + 'value' => $currentUser]], 'reset' => 'reset']; } static function getWaitingCriteria() { + $currentUser = Session::getLoginUserID(); return ['criteria' => [['field' => 4, 'searchtype' => 'equals', 'value' => 'process', - 'value' => Ticket::WAITING]], + 'value' => Ticket::WAITING], + ['field' => 8, + 'searchtype' => 'equals', + 'value' => $currentUser]], 'reset' => 'reset']; } static function getValidateCriteria() { + $currentUser = Session::getLoginUserID(); return ['criteria' => [['field' => 4, 'searchtype' => 'equals', 'value' => 'process', @@ -600,7 +609,7 @@ static function getValidateCriteria() { ['field' => 9, 'searchtype' => 'equals', 'value' => 'process', - 'value' => $_SESSION['glpiID'], + 'value' => $currentUser, 'link' => 'AND'], ['field' => 4, 'searchtype' => 'equals', @@ -610,15 +619,19 @@ static function getValidateCriteria() { ['field' => 11, 'searchtype' => 'equals', 'value' => 'process', - 'value' => $_SESSION['glpiID'], + 'value' => $currentUser, 'link' => 'AND']], 'reset' => 'reset']; } static function getSolvedCriteria() { + $currentUser = Session::getLoginUserID(); return ['criteria' => [['field' => 4, 'searchtype' => 'equals', - 'value' => 'old']], + 'value' => 'old'], + ['field' => 8, + 'searchtype' => 'equals', + 'value' => $currentUser]], 'reset' => 'reset']; }