From f1eee34828456ab2510f5d4ab8f545a12ca953e6 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Wed, 15 Oct 2025 10:52:18 +0000 Subject: [PATCH] Bug 40504: UI improvements This turns the 'Select manager' and 'Restore manager' actions to proper buttons, well aligned in where they are displayed. The 'Select manager' functionality in the suggestions table page is also updated to make use of the same reusable button block Signed-off-by: Jeremy Evans --- .../prog/en/includes/manageable-mixin.inc | 42 +++++++++++++++++-- .../prog/en/modules/suggestion/suggestion.tt | 27 +++++++----- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc index 32cb47be83d..0c476573ac7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc @@ -3,7 +3,11 @@ [% IF display == 'fieldset' %]
  • Managed by: - [% manager.firstname _ " " _ manager.surname _ " [" _ manager.cardnumber _ "]" | html %] + [% IF manager %] + [% manager.firstname _ " " _ manager.surname _ " [" _ manager.cardnumber _ "]" | html %] + [% ELSE %] + Nobody + [% END %]
  • [% ELSIF display == 'table' %] @@ -24,7 +28,7 @@ [% BLOCK select_manager_form %]
  • - +
    [% IF required_permission %] @@ -37,9 +41,10 @@ | Previously was [% INCLUDE 'patron-title.inc' patron=manager hide_patron_infos_if_needed=1 %] [% Branches.GetName( manager.branchcode ) | html %] ([% manager.category.description | html %]) [% END %]
    - Select manager + + [% PROCESS select_manager_button %] [% IF manager.borrowernumber && logged_in_user.borrowernumber != manager.borrowernumber %] - Keep existing manager + Keep existing manager [% END %] [% IF required_permission %] @@ -60,3 +65,32 @@
  • [% END %] + +[% BLOCK select_manager_button %] + [% IF href %] + [% hash_href_val = href %] + [% ELSE %] + [% hash_href_val = 'patron_search_modal_manager' %] + [% END %] + [% IF id %] + [% id_val = id %] + [% ELSE %] + [% id_val = 'edit_manager' %] + [% END %] + [% IF data_tab %] + [% id_val = id %] + [% ELSE %] + [% id_val = 'edit_manager' %] + [% END %] + + Select manager + +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 400397d8ecc..4763daad236 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -258,7 +258,8 @@ [% END %] - [% PROCESS select_manager_show + [% + PROCESS select_manager_show manager => managedby_patron display => "table" %] @@ -579,7 +580,8 @@ [% INCLUDE 'date-format.inc' %] - [% PROCESS select_manager_form + [% + PROCESS select_manager_form manager => managedby_patron notify_option => 1 required_permission => CAN_user_suggestions_suggestions_manage @@ -860,14 +862,16 @@
    Update manager - Select manager + [% hash_href_val = "patron_search_modal_manager_" _ suggestion.suggestiontype %] + [% id_val = "set_manager_" _ suggestion.suggestiontype %] + [% data_tab_val = suggestion.suggestiontype %] + + [% + PROCESS select_manager_button + href = hash_href_val + id = id_val + data_tab = data_tab_val + %]
    @@ -1197,7 +1201,8 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% INCLUDE 'select_manager.inc' + [% + INCLUDE 'select_manager.inc' manager => managedby_patron %]