tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-31 01:35:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ticket seach query when you are looking for an own ticket that is not in an owned department (#897)

Browse Source 
* update departments filter

* update php test
This commit is contained in:
Guillermo Giuliana 2020-09-29 01:14:06 -03:00 committed by GitHub
parent d4cdbab203
commit b73d6d534d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,7 @@ class SearchController extends Controller {
if(!$requestedOwnedDepartments && !$requestedNotOwnedDepartments){ if(!$requestedOwnedDepartments && !$requestedNotOwnedDepartments){
foreach($myDepartments as $department) { foreach($myDepartments as $department) {
if($first){ if($first){
$filters .= " ( "; $filters .= "(ticket.author_staff_id = " . $idStaff . " or ";
$first = FALSE; $first = FALSE;
} else { } else {
$filters .= " or "; $filters .= " or ";

2
server/tests/controllers/ticket/searchTest.php
View File

@ -168,7 +168,7 @@ class SearchControllerTest extends TestCase {
'staffId' => 1, 'staffId' => 1,
'allowedDepartments' => [2,1,3] 'allowedDepartments' => [2,1,3]
]), ]),
'FROM (ticket LEFT JOIN tag_ticket ON tag_ticket.ticket_id = ticket.id LEFT JOIN ticketevent ON ticketevent.ticket_id = ticket.id) WHERE ( ticket.department_id = 2 or ticket.department_id = 1 or ticket.department_id = 3) GROUP BY ticket.id' 'FROM (ticket LEFT JOIN tag_ticket ON tag_ticket.ticket_id = ticket.id LEFT JOIN ticketevent ON ticketevent.ticket_id = ticket.id) WHERE (ticket.author_staff_id = 1 or ticket.department_id = 2 or ticket.department_id = 1 or ticket.department_id = 3) GROUP BY ticket.id'
); );
$this->assertEquals( $this->assertEquals(