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

Fix update due date link, manager check, change due date btn visibility

Browse Source
This commit is contained in:
Mike Koch 2018-05-18 19:48:24 -04:00
parent 83e2ec500a
commit bc6299e5cf
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/admin_ticket.php
View File

@ -757,9 +757,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?> ?>
</span> </span>
</b><br> </b><br>
<?php if ($can_edit): ?>
<button class="btn btn-default btn-sm" id="change-button"> <button class="btn btn-default btn-sm" id="change-button">
<?php echo $hesklang['chg']; ?> <?php echo $hesklang['chg']; ?>
</button> </button>
<?php endif; ?>
</div> </div>
<div id="editable-due-date" style="display: none"> <div id="editable-due-date" style="display: none">
<span class="form-group"> <span class="form-group">

4
api/BusinessLogic/Security/UserToTicketChecker.php
View File

@ -36,9 +36,9 @@ class UserToTicketChecker extends \BaseClass {
return false; return false;
} }
$categoryManagerId = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings); $categoryManager = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings);
if ($user->id === $categoryManagerId) { if ($categoryManager !== null && $user->id === $categoryManager->id) {
return true; return true;
} }

2
api/BusinessLogic/Tickets/Ticket.php
View File

@ -42,7 +42,7 @@ class Ticket extends \BaseClass {
$ticket->numberOfReplies = intval($row['replies']); $ticket->numberOfReplies = intval($row['replies']);
$ticket->numberOfStaffReplies = intval($row['staffreplies']); $ticket->numberOfStaffReplies = intval($row['staffreplies']);
$ticket->ownerId = intval($row['owner']); $ticket->ownerId = intval($row['owner']);
$ticket->assignedBy = $row['assigned_by'] === null ? null : intval($row['assigned_by']); $ticket->assignedBy = $row['assignedby'] === null ? null : intval($row['assignedby']);
$ticket->timeWorked = $row['time_worked']; $ticket->timeWorked = $row['time_worked'];
$ticket->lastReplyBy = intval($row['lastreplier']); $ticket->lastReplyBy = intval($row['lastreplier']);
$ticket->lastReplier = $row['replierid'] === null ? null : intval($row['replierid']); $ticket->lastReplier = $row['replierid'] === null ? null : intval($row['replierid']);

2
internal-api/js/admin-ticket.js
View File

@ -23,7 +23,7 @@ $(document).ready(function() {
var ticketId = $('input[type="hidden"][name="orig_id"]').val(); var ticketId = $('input[type="hidden"][name="orig_id"]').val();
$.ajax({ $.ajax({
method: 'POST', method: 'POST',
url: heskPath + 'api/v1/staff/tickets/' + ticketId + '/due-date', url: heskPath + 'api/index.php/v1/staff/tickets/' + ticketId + '/due-date',
headers: { headers: {
'X-Internal-Call': true, 'X-Internal-Call': true,
'X-HTTP-Method-Override': 'PATCH' 'X-HTTP-Method-Override': 'PATCH'