Update CategoryGateway

merge-requests/62/head
Mike Koch 7 years ago
parent fe898a7a1c
commit 33ab18e826

@ -32,9 +32,19 @@ class Category {
public $usage; public $usage;
/** /**
* @var string? The color of the Categories * @var string
*/ */
public $color; public $backgroundColor;
/**
* @var string
*/
public $foregroundColor;
/**
* @var bool
*/
public $displayBorder;
/** /**
* @var int The default Tickets priority * @var int The default Tickets priority

@ -28,7 +28,9 @@ class CategoryGateway extends CommonDao {
$category->autoAssign = $row['autoassign'] == 1; $category->autoAssign = $row['autoassign'] == 1;
$category->type = intval($row['type']); $category->type = intval($row['type']);
$category->usage = intval($row['usage']); $category->usage = intval($row['usage']);
$category->color = $row['color']; $category->backgroundColor = $row['background_color'];
$category->foregroundColor = $row['foreground_color'];
$category->displayBorder = $row['display_border_outline'] === '1';
$category->priority = intval($row['priority']); $category->priority = intval($row['priority']);
$category->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']); $category->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']);
$results[$category->id] = $category; $results[$category->id] = $category;

@ -49,7 +49,7 @@ $(document).ready(function() {
var ticketId = $this.data('ticket-id'); var ticketId = $this.data('ticket-id');
var replyId = $this.data('reply-id'); var replyId = $this.data('reply-id');
var heskUrl = $('span#heskUrl').text(); var heskUrl = $('span#heskUrl').text();
var apiUrl = heskUrl + '/api/v1-internal/staff/tickets/' + ticketId + '/resend-email'; var apiUrl = heskUrl + '/api/index.php/v1-internal/staff/tickets/' + ticketId + '/resend-email';
if (replyId !== undefined) { if (replyId !== undefined) {
apiUrl += '?replyId=' + replyId; apiUrl += '?replyId=' + replyId;

Loading…
Cancel
Save