Bugzilla – Attachment 195141 Details for
Bug 6473
Test bug for Git-bz ✔ ❤ ★
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:00:16 UTC
(
hide
)
Description:
Bug 40504: (QA follow-up) Tidy
Filename:
MIME Type:
Creator:
Lisette Scheer
Created:
2026-03-11 22:00:16 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 6473
:
4386
|
6837
|
6838
|
6839
|
6840
|
6841
|
6842
|
6843
|
7154
|
7155
|
7567
|
7994
|
7995
|
7996
|
7997
|
8018
|
9807
|
9808
|
9813
|
9831
|
9832
|
9836
|
9854
|
10842
|
10843
|
10844
|
10845
|
10846
|
10847
|
10848
|
10849
|
10850
|
10851
|
10852
|
10853
|
10854
|
10855
|
10856
|
10857
|
10858
|
11540
|
11543
|
11544
|
12502
|
12513
|
12514
|
12515
|
12516
|
12517
|
12518
|
12519
|
13473
|
13673
|
14955
|
14969
|
14970
|
14972
|
15201
|
18949
|
18950
|
18951
|
18952
|
18953
|
18954
|
18955
|
18956
|
18957
|
18958
|
18959
|
18960
|
18961
|
18962
|
18963
|
18971
|
18972
|
19518
|
19519
|
19591
|
19592
|
19871
|
19879
|
19880
|
19881
|
19882
|
20011
|
20012
|
20013
|
20014
|
22477
|
22481
|
22482
|
22496
|
22502
|
22503
|
31958
|
32444
|
32445
|
32446
|
32447
|
32448
|
32449
|
32450
|
32451
|
32452
|
34200
|
34201
|
34625
|
34999
|
35130
|
35269
|
35273
|
35274
|
35275
|
35276
|
35277
|
35279
|
35280
|
35303
|
40954
|
40957
|
45345
|
45349
|
45731
|
45732
|
45733
|
45734
|
47283
|
47284
|
47298
|
47299
|
47300
|
47334
|
47336
|
49083
|
56974
|
61059
|
61069
|
62038
|
65313
|
77301
|
78016
|
79959
|
80178
|
80179
|
80180
|
80181
|
80182
|
84400
|
86644
|
86645
|
87152
|
88128
|
95586
|
95716
|
97394
|
99026
|
99027
|
114217
|
114218
|
114219
|
114220
|
114221
|
114222
|
114223
|
114224
|
114225
|
114226
|
119255
|
121181
|
131891
|
131893
|
131894
|
134862
|
144109
|
144144
|
144671
|
144672
|
144673
|
147183
|
149030
|
149031
|
149032
|
149033
|
160566
|
160567
|
160568
|
182093
|
183107
|
183177
|
183178
|
183179
|
183180
|
183182
|
183183
|
183285
|
183286
|
187209
|
187321
|
187322
|
187323
|
187324
|
187325
|
187326
|
187327
|
187328
|
187329
|
187330
|
187331
|
187332
|
187333
|
187334
|
187335
|
187336
|
187337
|
187338
|
187339
|
187340
|
187341
|
187342
|
187343
|
187344
|
187345
|
187346
|
187347
|
187348
|
187349
|
187350
|
187351
|
187352
|
187353
|
187354
|
187355
|
187356
|
187357
|
187358
|
187359
|
187360
|
187361
|
187362
|
187363
|
187364
|
187365
|
187366
|
187367
|
187368
|
187369
|
187370
|
187371
|
187372
|
187545
|
187546
|
188609
|
188610
|
188611
|
188612
|
188613
|
188614
|
188626
|
188627
|
188628
|
188629
|
188630
|
188631
|
188632
|
188633
|
188634
|
188645
|
188647
|
188703
|
188929
|
188937
|
188975
|
190164
|
190165
|
190166
|
190167
|
190168
|
190169
|
190170
|
190171
|
190172
|
190173
|
190174
|
190175
|
190176
|
190177
|
190178
|
190179
|
190180
|
190181
|
190182
|
190183
|
190184
|
190185
|
190186
|
190187
|
190188
|
190240
|
190241
|
190242
|
190243
|
190244
|
190245
|
190246
|
190247
|
190248
|
190249
|
190250
|
190251
|
190252
|
190253
|
190255
|
190256
|
190711
|
190712
| 195141