tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-29 08:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[DEV-222] Search fails when staff has no departments assigned (#1172)

Browse Source 
* commented pr

* fix no department assigned issue

* undo irrelevants changes
This commit is contained in:
Joel Elias Méndez 2022-04-19 13:16:31 -03:00 committed by GitHub
parent f890fdc2d3
commit 86cad910ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ class SearchController extends Controller {
public function getSQLQueryWithOrder($inputs, $query) { public function getSQLQueryWithOrder($inputs, $query) {
$order = ""; $order = "";
$query = "SELECT" . " ticket.id " . $query; $query = "SELECT ticket.id " . $query;
$this->setQueryOrder($inputs, $order); $this->setQueryOrder($inputs, $order);
$inputs['page'] ? $page = $inputs['page'] : $page = 1 ; $inputs['page'] ? $page = $inputs['page'] : $page = 1 ;
@ -168,10 +168,12 @@ class SearchController extends Controller {
if(array_key_exists('tags',$inputs)) $this->setTagFilter($inputs['tags'], $filters); if(array_key_exists('tags',$inputs)) $this->setTagFilter($inputs['tags'], $filters);
if(array_key_exists('closed',$inputs)) $this->setClosedFilter($inputs['closed'], $filters); if(array_key_exists('closed',$inputs)) $this->setClosedFilter($inputs['closed'], $filters);
if(array_key_exists('assigned',$inputs)) $this->setAssignedFilter($inputs['assigned'], $filters); if(array_key_exists('assigned',$inputs)) $this->setAssignedFilter($inputs['assigned'], $filters);
if(array_key_exists('unreadStaff',$inputs)) $this->setSeenFilter($inputs['unreadStaff'], $filters); if(array_key_exists('unreadStaff',$inputs)) {
$this->setSeenFilter($inputs['unreadStaff'], $filters);
}
if(array_key_exists('dateRange',$inputs)) $this->setDateFilter($inputs['dateRange'], $filters); if(array_key_exists('dateRange',$inputs)) $this->setDateFilter($inputs['dateRange'], $filters);
if(array_key_exists('departments',$inputs) && array_key_exists('allowedDepartments',$inputs) && array_key_exists('staffId',$inputs)){ if(array_key_exists('departments',$inputs) && array_key_exists('allowedDepartments',$inputs) && array_key_exists('staffId',$inputs)){
if(!$this->ignoreDeparmentFilter) $this->setDepartmentFilter($inputs['departments'],$inputs['allowedDepartments'], $inputs['staffId'], $filters); if(!$this->ignoreDeparmentFilter) $this->setDepartmentFilter($inputs['departments'],$inputs['allowedDepartments'], $inputs['staffId'], $filters);
} }
if(array_key_exists('authors',$inputs)) $this->setAuthorFilter($inputs['authors'], $filters); if(array_key_exists('authors',$inputs)) $this->setAuthorFilter($inputs['authors'], $filters);
if(array_key_exists('owners',$inputs)) $this->setOwnerFilter($inputs['owners'], $filters); if(array_key_exists('owners',$inputs)) $this->setOwnerFilter($inputs['owners'], $filters);
@ -217,14 +219,13 @@ class SearchController extends Controller {
} }
private function setDepartmentFilter($requestedDepartments,$myDepartments, $idStaff, &$filters){ private function setDepartmentFilter($requestedDepartments,$myDepartments, $idStaff, &$filters){
if ($filters != "") $filters .= " and ";
if (!$requestedDepartments) $requestedDepartments = []; if (!$requestedDepartments) $requestedDepartments = [];
$requestedOwnedDepartments = $this->getRequestedOwnedDepartments($requestedDepartments, $myDepartments); $requestedOwnedDepartments = $this->getRequestedOwnedDepartments($requestedDepartments, $myDepartments);
$requestedNotOwnedDepartments = $this->getRequestedNotOwnedDepartments($requestedDepartments, $myDepartments); $requestedNotOwnedDepartments = $this->getRequestedNotOwnedDepartments($requestedDepartments, $myDepartments);
$first = TRUE; $first = TRUE;
if(!$requestedOwnedDepartments && !$requestedNotOwnedDepartments && !!$myDepartments){
if(!$requestedOwnedDepartments && !$requestedNotOwnedDepartments){ if ($filters != "") $filters .= " and ";
foreach($myDepartments as $department) { foreach($myDepartments as $department) {
if($first){ if($first){
$filters .= "(ticket.author_staff_id = " . $idStaff . " or "; $filters .= "(ticket.author_staff_id = " . $idStaff . " or ";
@ -233,10 +234,10 @@ class SearchController extends Controller {
$filters .= " or "; $filters .= " or ";
} }
$filters .= "ticket.department_id = " . $department; $filters .= "ticket.department_id = " . $department;
} }
$filters .= ")"; $filters .= ")";
} }
if($requestedOwnedDepartments){ if($requestedOwnedDepartments){
foreach($requestedOwnedDepartments as $department) { foreach($requestedOwnedDepartments as $department) {
if($first){ if($first){
@ -248,7 +249,7 @@ class SearchController extends Controller {
$filters .= "ticket.department_id = " . $department; $filters .= "ticket.department_id = " . $department;
} }
} }
if($requestedNotOwnedDepartments){ if($requestedNotOwnedDepartments){
if($requestedOwnedDepartments) $filters .= " or "; if($requestedOwnedDepartments) $filters .= " or ";
$filters .= "(ticket.author_staff_id = " . $idStaff . " and "; $filters .= "(ticket.author_staff_id = " . $idStaff . " and ";