Bugzilla – Attachment 188571 Details for
Bug 40504
ILL requests should have ability to assign staff to manage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 40504: UI improvements
Bug-40504-UI-improvements.patch (text/plain), 7.57 KB, created by
Pedro Amorim
on 2025-10-29 16:22:30 UTC
(
hide
)
Description:
Bug 40504: UI improvements
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2025-10-29 16:22:30 UTC
Size:
7.57 KB
patch
obsolete
>From f1eee34828456ab2510f5d4ab8f545a12ca953e6 Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@openfifth.co.uk> >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 <Jeremy.Evans@ukhsa.gov.uk> >--- > .../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' %] > <li class="managedby"> > <span class="label managedby">Managed by:</span> >- <a href="[% borrowerlink | url %]" title="View manager details"> [% manager.firstname _ " " _ manager.surname _ " [" _ manager.cardnumber _ "]" | html %] </a> >+ [% IF manager %] >+ <a href="[% borrowerlink | url %]" title="View manager details"> [% manager.firstname _ " " _ manager.surname _ " [" _ manager.cardnumber _ "]" | html %] </a> >+ [% ELSE %] >+ Nobody >+ [% END %] > </li> > [% ELSIF display == 'table' %] > <tr> >@@ -24,7 +28,7 @@ > > [% BLOCK select_manager_form %] > <li> >- <label for="managedby_name">by:</label> >+ <label for="managedby_name">Managed by:</label> > <div> > <span id="managedby_name" name="managedby_name"> > [% 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 %] > <br /> >- <a href="#patron_search_modal_manager" id="edit_manager" data-bs-toggle="modal"><i class="fa fa-search"></i> Select manager</a> >+ <label> </label> >+ [% PROCESS select_manager_button %] > [% IF manager.borrowernumber && logged_in_user.borrowernumber != manager.borrowernumber %] >- <a id="restore_previous_manager" href="#"><i class="fa fa-trash-can"></i> Keep existing manager</a> >+ <a class="btn btn-default btn-xs" id="restore_previous_manager" href="#"><i class="fa fa-trash-can"></i> Keep existing manager</a> > [% END %] > [% IF required_permission %] > <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> >@@ -60,3 +65,32 @@ > </div> > </li> > [% 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 %] >+ <a >+ href="#[% hash_href_val | uri %]" >+ id="[% id_val | uri %]" >+ data-bs-toggle="modal" >+ class="btn btn-default btn-xs" >+ [% IF data_tab %] >+ data-tab="[% data_tab | uri %]" >+ [% END %] >+ > >+ <i class="fa fa-search"></i> Select manager >+ </a> >+[% 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 %] > </td> > </tr> >- [% PROCESS select_manager_show >+ [% >+ PROCESS select_manager_show > manager => managedby_patron > display => "table" > %] >@@ -579,7 +580,8 @@ > <label for="managedon">Managed on:</label> > <input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% manageddate | html %]" />[% INCLUDE 'date-format.inc' %] > </li> >- [% 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 @@ > <div class="col-sm-2"> > <fieldset class="brief"> > <span class="label">Update manager</span> >- <a >- href="#patron_search_modal_manager_[% suggestion.suggestiontype | uri %]" >- id="set_manager_[% suggestion.suggestiontype | uri %]" >- data-tab="[% suggestion.suggestiontype | uri %]" >- class="set_manager" >- data-bs-toggle="modal" >- ><i class="fa fa-search"></i> Select manager</a >- > >+ [% 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 >+ %] > <span id="managedby_name-[% suggestion.suggestiontype | html %]"></span> > </fieldset> > <fieldset class="action"> >@@ -1197,7 +1201,8 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'select_manager.inc' >+ [% >+ INCLUDE 'select_manager.inc' > manager => managedby_patron > %] > <script> >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 40504
:
187906
|
187907
|
187908
|
187909
|
187910
|
187911
|
187912
|
187913
|
187914
|
187915
|
188365
|
188563
|
188565
|
188566
|
188567
|
188568
|
188569
|
188570
| 188571 |
188572
|
188573
|
188574
|
188624
|
188625
|
188935
|
188936