Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix admin visibility of tickets on calendar, included assignedByMe to filer

Browse Source
This commit is contained in:
Mike Koch 2018-05-19 10:50:57 -04:00
parent 26de217fef
commit d4a48c6c73
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/BusinessLogic/Calendar/SearchEventsFilter.php
View File

@ -27,4 +27,7 @@ class SearchEventsFilter {
/* @var $includeTicketsAssignedToOthers bool */ /* @var $includeTicketsAssignedToOthers bool */
public $includeTicketsAssignedToOthers; public $includeTicketsAssignedToOthers;
/* @var $includeTicketsAssignedToMe bool */
public $includeTicketsAssignedToMe;
} }

6
api/Controllers/Calendar/CalendarController.php
View File

@ -45,6 +45,7 @@ class CalendarController extends \BaseClass {
$searchEventsFilter->includeTicketsAssignedToOthers = false; $searchEventsFilter->includeTicketsAssignedToOthers = false;
$searchEventsFilter->includeUnassignedTickets = false; $searchEventsFilter->includeUnassignedTickets = false;
$searchEventsFilter->includeTickets = false; $searchEventsFilter->includeTickets = false;
$searchEventsFilter->includeTicketsAssignedToMe = false;
/* @var $categoryHandler CategoryHandler */ /* @var $categoryHandler CategoryHandler */
$categoryHandler = $applicationContext->get(CategoryHandler::clazz()); $categoryHandler = $applicationContext->get(CategoryHandler::clazz());
@ -56,9 +57,10 @@ class CalendarController extends \BaseClass {
} }
$searchEventsFilter->categories = $ids; $searchEventsFilter->categories = $ids;
} else { } else {
$searchEventsFilter->includeTicketsAssignedToOthers = in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions); $searchEventsFilter->includeTicketsAssignedToOthers = $userContext->admin ? true : in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions);
$searchEventsFilter->includeUnassignedTickets = in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions); $searchEventsFilter->includeUnassignedTickets = $userContext->admin ? true : in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions);
$searchEventsFilter->includeTickets = true; $searchEventsFilter->includeTickets = true;
$searchEventsFilter->includeTicketsAssignedToMe = $userContext->admin ? true : in_array(UserPrivilege::CAN_VIEW_ASSIGNED_BY_ME, $userContext->permissions);
$searchEventsFilter->categories = $userContext->admin ? null : $userContext->categories; $searchEventsFilter->categories = $userContext->admin ? null : $userContext->categories;
} }

4
api/DataAccess/Calendar/CalendarGateway.php
View File

@ -138,6 +138,10 @@ class CalendarGateway extends CommonDao {
$sql .= " OR `owner` = 0 "; $sql .= " OR `owner` = 0 ";
} }
if ($searchEventsFilter->includeTicketsAssignedToMe) {
$sql .= " OR `assignedby` = " . intval($searchEventsFilter->includeTicketsAssignedToMe);
}
if ($searchEventsFilter->includeTicketsAssignedToOthers) { if ($searchEventsFilter->includeTicketsAssignedToOthers) {
$sql .= " OR `owner` NOT IN (0, " . $searchEventsFilter->reminderUserId . ") "; $sql .= " OR `owner` NOT IN (0, " . $searchEventsFilter->reminderUserId . ") ";
} }