diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php index ab9bc1af..755188f3 100644 --- a/api/BusinessLogic/Categories/Category.php +++ b/api/BusinessLogic/Categories/Category.php @@ -32,9 +32,19 @@ class Category { 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 diff --git a/api/DataAccess/Categories/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php index abda07b9..4fd35c7b 100644 --- a/api/DataAccess/Categories/CategoryGateway.php +++ b/api/DataAccess/Categories/CategoryGateway.php @@ -28,7 +28,9 @@ class CategoryGateway extends CommonDao { $category->autoAssign = $row['autoassign'] == 1; $category->type = intval($row['type']); $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->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']); $results[$category->id] = $category; diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js index ea7de91e..3e8013ce 100644 --- a/internal-api/js/admin-ticket.js +++ b/internal-api/js/admin-ticket.js @@ -49,7 +49,7 @@ $(document).ready(function() { var ticketId = $this.data('ticket-id'); var replyId = $this.data('reply-id'); 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) { apiUrl += '?replyId=' + replyId;