tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ticket search when staff hasnt deparments and shows own tickets

This commit is contained in:
Guillermo Giuliana 2020-01-22 01:18:23 -03:00
parent 42f8be1870
commit fe31163a8a
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/controllers/ticket/search.php
View File

@ -120,7 +120,7 @@ class SearchController extends Controller {
$totalCount = RedBean::getAll("SELECT COUNT(*) FROM (SELECT COUNT(*) " . $query . " ) AS T2", [':query' => $inputs['query']])[0]['COUNT(*)'];
$ticketIdList = RedBean::getAll($queryWithOrder, [':query' => "%" . $inputs['query'] . "%"]);
$ticketList = [];
foreach ($ticketIdList as $item) {
$ticket = Ticket::getDataStore($item['id']);
array_push($ticketList, $ticket->toArray());
@ -245,20 +245,26 @@ class SearchController extends Controller {
}
private function setDepartmentFilter($departments,$allowedDepartments, &$filters){
$validDepartments = $this->generateValidDepartmentList($departments, $allowedDepartments);
$idStaff = Controller::getLoggedUser()->id ;
if ($filters != "") $filters .= " and ";
$validDepartments = $this->generateValidDepartmentList($departments, $allowedDepartments);
$first = TRUE;
foreach($validDepartments as $department) {
if($first){
$filters .= " ( ";
$first = FALSE;
} else {
$filters .= " or ";
if($validDepartments){
foreach($validDepartments as $department) {
if($first){
$filters .= " ( ";
$first = FALSE;
} else {
$filters .= " or ";
}
$filters .= "ticket.department_id = " . $department;
}
$filters .= "ticket.department_id = " . $department;
$filters .= " or ";
}else{
$filters .= "(";
}
$filters .= ")";
$filters .= "ticket.author_staff_id = " . $idStaff . ")";
}