From 34895de5bc21c82a504eab5eaf44d168b43878ab Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 22 Mar 2018 21:42:00 -0400 Subject: [PATCH 1/7] Business hours should be hidden --- calendar.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/calendar.php b/calendar.php index 64488e4c..2f788a8c 100644 --- a/calendar.php +++ b/calendar.php @@ -120,11 +120,11 @@ echo mfh_get_hidden_fields_for_language(array(

- - -

-

- \ No newline at end of file + +

+

+ + \ No newline at end of file From 56eeaea61ecddf0b4f6d9cf8f261a949025a1906 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 22 Mar 2018 21:43:29 -0400 Subject: [PATCH 2/7] Fix non-contentified strings --- admin/service_messages.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/service_messages.php b/admin/service_messages.php index 052e0eb4..a3efb682 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -127,8 +127,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

From f290fd75197e9fe8e46d33c693dc4adf37f959a6 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 22 Mar 2018 21:44:43 -0400 Subject: [PATCH 3/7] Update TinyMCE version --- inc/headerAdmin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index 37976b7b..8b5af140 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -194,7 +194,7 @@ header('X-UA-Compatible: IE=edge'); /* If page requires WYSIWYG editor include TinyMCE Javascript */ if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) { ?> - + Date: Thu, 22 Mar 2018 21:54:55 -0400 Subject: [PATCH 4/7] Fix issue with category auto-assign --- internal-api/js/manage-categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 5ea1ad59..e91836fb 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -268,7 +268,7 @@ function bindFormSubmit() { var foregroundColor = $modal.find('input[name="foreground-color"]').val(); var manager = parseInt($modal.find('select[name="manager"]').val()); var data = { - autoassign: $modal.find('input[name="autoassign"]').val() === 'true', + autoassign: $modal.find('input[name="autoassign"]:checked').val() === '1', backgroundColor: $modal.find('input[name="background-color"]').val(), description: $modal.find('textarea[name="description"]').val(), displayBorder: $modal.find('input[name="display-border"]:checked').val() === '1', From ed04663d08e32e2b6cf3d52b17f31655088f9635 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 22 Mar 2018 22:09:17 -0400 Subject: [PATCH 5/7] Fix changing ticket due date --- api/Controllers/Tickets/StaffTicketController.php | 10 +++++++++- internal-api/js/admin-ticket.js | 13 ++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php index e049bca5..7cefe216 100644 --- a/api/Controllers/Tickets/StaffTicketController.php +++ b/api/Controllers/Tickets/StaffTicketController.php @@ -10,6 +10,7 @@ use BusinessLogic\Tickets\TicketDeleter; use BusinessLogic\Tickets\TicketEditor; use BusinessLogic\Tickets\TicketRetriever; use Controllers\JsonRetriever; +use Symfony\Component\Console\Helper\Helper; class StaffTicketController extends \BaseClass { function get($id) { @@ -55,7 +56,14 @@ class StaffTicketController extends \BaseClass { $json = JsonRetriever::getJsonData(); - $dueDate = date('Y-m-d H:i:s', strtotime(Helpers::safeArrayGet($json, 'dueDate'))); + $newDueDate = Helpers::safeArrayGet($json, 'dueDate'); + + if ($newDueDate !== null) { + $dueDate = date('Y-m-d H:i:s', strtotime(Helpers::safeArrayGet($json, 'dueDate'))); + } else { + $dueDate = null; + } + $ticketEditor->updateDueDate($id, $dueDate, $userContext, $hesk_settings); } diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js index 1364337c..81ae9c8a 100644 --- a/internal-api/js/admin-ticket.js +++ b/internal-api/js/admin-ticket.js @@ -20,14 +20,17 @@ $(document).ready(function() { $editableDueDateContainer.find('#submit').click(function() { var newDueDate = $editableDueDateContainer.find('input[type="text"][name="due-date"]').val(); + var ticketId = $('input[type="hidden"][name="orig_id"]').val(); $.ajax({ method: 'POST', - url: heskPath + 'internal-api/admin/calendar/', - data: { - trackingId: $('input[type="hidden"][name="track"]').val(), - action: 'update-ticket', - dueDate: newDueDate + url: heskPath + 'api/v1/staff/tickets/' + ticketId + '/due-date', + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': 'PATCH' }, + data: JSON.stringify({ + dueDate: newDueDate === '' ? null : newDueDate + }), success: function() { mfhAlert.success(mfhLang.text('ticket_due_date_updated')); $readonlyDueDateContainer.find('span#due-date').text(newDueDate == '' ? $('#lang_none').text() : newDueDate); From b3245aa38d677ecd0d9e11d49007e40174e148b2 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 23 Mar 2018 12:48:55 -0400 Subject: [PATCH 6/7] Update build --- build.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.php b/build.php index 189c8f08..a33f04d7 100644 --- a/build.php +++ b/build.php @@ -1,4 +1,4 @@ Date: Fri, 23 Mar 2018 12:52:30 -0400 Subject: [PATCH 7/7] Add update migration --- install/migrations/core.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/migrations/core.php b/install/migrations/core.php index e02a83ca..3a48ce6c 100644 --- a/install/migrations/core.php +++ b/install/migrations/core.php @@ -228,5 +228,6 @@ function getAllMigrations() { 170 => new \v330\CalendarImprovements\AddShowStartTimeSetting(170), 171 => new \v330\AddHighlightTicketRowsSetting(171), 172 => new UpdateMigration('3.3.0', '3.2.5', 172), + 173 => new UpdateMigration('3.3.1', '3.3.0', 173), ); } \ No newline at end of file