From 72c213c11f1cf83096ea9e0c4d54f31395acaaf4 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 21 Dec 2023 15:58:41 +0000 Subject: [PATCH] Bug 32435: Add resolution states to Catalog concerns This patch adds resolution types to the catalog concerns feature. It allows libraries to define a list of 'TICKET_RESOLUTION' authorized values from which librarians can then pick at the point of resolving a catalog concern. To test: 1) Apply the patches and run the database updates 2) Enable catalog concerns (staff or opac will do the trick) 3) Submit a catalog concern 4) Confirm that you can still resolve a concern from the catalog concerns management page as before. 5) Add some values to the new TICKET_RESOLUTION authorized values 6) Submit a new catalog concern 7) Confirm that the 'Resolve' button in the management modal is now a dropdown containing the list of resolution values defined above. --- .../en/includes/modals/display_ticket.inc | 19 ++++++++++++++++++- .../prog/js/modals/display_ticket.js | 13 +++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc index 3bf471ae4fa..32af981f556 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc @@ -1,3 +1,5 @@ +[% USE AuthorisedValues %] +[% SET avs = AuthorisedValues.GetAuthValueDropbox('TICKET_RESOLUTION') %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js b/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js index 653f3f97263..d6a303d5690 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js +++ b/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js @@ -51,6 +51,9 @@ $(document).ready(function() { display_cardnumber: false, url: true }) + ' (' + $datetime(item.date) + ')'; + if ( item.status ) { + updates += '' + item.status + '' + } updates += ''; }); updates_display.html(updates); @@ -90,13 +93,15 @@ $(document).ready(function() { }); }); - $('#ticketDetailsModal').on('click', '#resolveTicket', function(e) { + $('#ticketDetailsModal').on('click', '.resolveSubmit', function(event) { + let clicked = $(this); let ticket_id = $('#ticket_id').val(); let params = { 'public': $('#public').is(":checked"), - message: $('#update_message').val(), - user_id: logged_in_user_borrowernumber, - state: 'resolved' + 'message': $('#update_message').val(), + 'user_id': logged_in_user_borrowernumber, + 'state': 'resolved', + 'status': clicked.data('resolution') }; $('#resolve-spinner').show(); -- 2.43.0