Bugzilla – Attachment 195142 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: (QA follow-up) Tidy
73a86d3.patch (text/plain), 8.68 KB, created by
Lisette Scheer
on 2026-03-11 22:03:38 UTC
(
hide
)
Description:
Bug 40504: (QA follow-up) Tidy
Filename:
MIME Type:
Creator:
Lisette Scheer
Created:
2026-03-11 22:03:38 UTC
Size:
8.68 KB
patch
obsolete
>From 73a86d343fed39a2c50a2fc13305f5ce91ed501f Mon Sep 17 00:00:00 2001 >From: Lisette Scheer <lisette@bywatersolutions.com> >Date: Wed, 11 Mar 2026 21:27:33 +0000 >Subject: [PATCH] Bug 40504: (QA follow-up) Tidy > >--- > ill/ill-requests.pl | 4 +-- > .../prog/en/includes/select_manager.inc | 16 ++---------- > .../prog/en/modules/ill/ill-requests.tt | 16 +++--------- > .../prog/en/modules/suggestion/suggestion.tt | 25 +++---------------- > 4 files changed, 11 insertions(+), 50 deletions(-) > >diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl >index b5d6c9490dc..5d74a75d17e 100755 >--- a/ill/ill-requests.pl >+++ b/ill/ill-requests.pl >@@ -144,12 +144,12 @@ if ($backends_available) { > $op = 'historycheck'; > $template->param( $history_check->history_check_template_params($params) ) > >- # ILLCheckAvailability operation >+ # ILLCheckAvailability operation > } elsif ( $availability->show_availability($request) ) { > $op = 'availability'; > $template->param( $availability->availability_template_params($params) ) > >- # ILLModuleDisclaimerByType operation >+ # ILLModuleDisclaimerByType operation > } elsif ( $type_disclaimer->show_type_disclaimer($request) ) { > $op = 'typedisclaimer'; > $template->param( $type_disclaimer->type_disclaimer_template_params($params) ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc >index a2fe25ea513..2b3f496adc9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc >@@ -2,20 +2,8 @@ > [% IF add_modal %] > [% SET columns = ['cardnumber','name','category','branch','action'] %] > [% SET filter = filter %] >- [% PROCESS patron_search_modal >- columns => columns, >- modal_title => t("Select manager"), >- patron_search_modal_id => 'patron_search_modal_manager', >- table_id => 'patron_search_modal_manager_table' >- %] >- [% PROCESS patron_search_js >- columns => columns, >- actions => ["select"], >- preview_on_name_click => 1, >- table_id => 'patron_search_modal_manager_table', >- callback => 'select_manager' >- empty_table_settings => 1 >- %] >+ [% PROCESS patron_search_modal columns => columns, modal_title => t("Select manager"), patron_search_modal_id => 'patron_search_modal_manager', table_id => 'patron_search_modal_manager_table' %] >+ [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1, table_id => 'patron_search_modal_manager_table', callback => 'select_manager' empty_table_settings => 1 %] > [% END %] > <script> > function select_manager(borrowernumber, borrower) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index e3e0daf8160..0a7961a678d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -392,10 +392,7 @@ > <label for="borrowernumber">Patron ID:</label> > <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]" /> > </li> >- [% PROCESS select_manager_form >- manager => request.manager >- required_permission => CAN_user_ill >- %] >+ [% PROCESS select_manager_form manager => request.manager equired_permission => CAN_user_ill %] > <li class="biblio_id"> > <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label> > <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]" /> >@@ -651,10 +648,7 @@ > <a href="[% borrowerlink | url %]" title="View borrower details"> [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] </a> > </li> > [% END %] >- [% PROCESS select_manager_show >- manager => request.manager >- display => "fieldset" >- %] >+ [% PROCESS select_manager_show manager => request.manager display => "fieldset" %] > [% IF request.biblio_id %] > <li class="biblio_id"> > <span class="label biblio_id">Bibliographic record ID:</span> >@@ -1130,11 +1124,7 @@ > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'select2.inc' %] > [% IF op == 'edit_action' %] >- [% INCLUDE 'select_manager.inc' >- add_modal => 1 >- manager => request.manager >- filter => 'ill_users' >- %] >+ [% INCLUDE 'select_manager.inc' add_modal => 1 manager => request.manager filter => 'ill_users' %] > [% END %] > [% IF metadata_enrichment_services %] > <script> >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 fef5e125b42..c1214725bd0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -258,11 +258,7 @@ > [% END %] > </td> > </tr> >- [% >- PROCESS select_manager_show >- manager => suggestion.manager >- display => "table" >- %] >+ [% PROCESS select_manager_show manager => suggestion.manager display => "table" %] > <tr> > <th>Accepted on:</th> > <td>[% suggestion.accepteddate | $KohaDates %]</td> >@@ -596,12 +592,7 @@ > <label for="managedon">Managed on:</label> > <input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% default_manageddate | html %]" />[% INCLUDE 'date-format.inc' %] > </li> >- [% >- PROCESS select_manager_form >- manager => suggestion.manager >- notify_option => 1 >- required_permission => CAN_user_suggestions_suggestions_manage >- %] >+ [% PROCESS select_manager_form manager => suggestion.manager notify_option => 1 required_permission => CAN_user_suggestions_suggestions_manage %] > </ol> > </fieldset> > >@@ -882,12 +873,7 @@ > [% 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 >- %] >+ [% 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"> >@@ -1217,10 +1203,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- [% >- INCLUDE 'select_manager.inc' >- manager => suggestion.manager >- %] >+ [% INCLUDE 'select_manager.inc' manager => suggestion.manager %] > <script> > function select_suggester(borrowernumber, borrower) { > $.ajax({ >-- >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
|
191196
|
191197
|
191198
|
191199
|
191200
|
191201
|
191202
|
191203
|
191204
|
191205
|
191206
|
192094
|
193186
|
193187
|
193188
|
193189
|
193190
|
193191
|
193192
|
193193
|
193194
|
193195
|
193196
|
193197
|
194023
|
194024
|
194026
|
194027
|
194028
|
194029
|
194030
|
194031
|
194032
|
194033
|
194034
|
194035
|
194036
|
194037
|
194038
|
194332
| 195142