Bugzilla – Attachment 132727 Details for
Bug 30093
Rewrite the patron search when placing a hold with the REST API route
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30093: Fix QA failures
Bug-30093-Fix-QA-failures.patch (text/plain), 5.99 KB, created by
Martin Renvoize (ashimema)
on 2022-03-31 12:14:23 UTC
(
hide
)
Description:
Bug 30093: Fix QA failures
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-03-31 12:14:23 UTC
Size:
5.99 KB
patch
obsolete
>From 1e457dead2d0fbbec567eea55b3f80e86db3ab7c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 31 Mar 2022 13:44:16 +0200 >Subject: [PATCH] Bug 30093: Fix QA failures > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/includes/js-patron-format-address.inc | 2 +- > .../intranet-tmpl/prog/en/includes/patron-search.inc | 12 ++++++------ > .../intranet-tmpl/prog/en/modules/members/search.tt | 11 +---------- > .../intranet-tmpl/prog/en/modules/reserve/request.tt | 12 +----------- > 4 files changed, 9 insertions(+), 28 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc >index 60923ec524..407bc42e2f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc >@@ -101,7 +101,7 @@ > window.$format_address = function(data, options) { > let line_break = options && options.no_line_break ? ' ' : '<br/>'; > [%~ IF Koha.Preference( 'AddressFormat' ) ~%] >- return member_display_address_style_[% Koha.Preference( 'AddressFormat' ) %](data, line_break); >+ return member_display_address_style_[% Koha.Preference( 'AddressFormat' ) | html %](data, line_break); > [%~ ELSE ~%] > return member_display_address_style_us(data, line_break); > [%~ END ~%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index 07ec9cd093..d088ebc2e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -78,7 +78,7 @@ > [% END %] > </div> > >- <div id="[% table_id %]_search_results" style="display:none;"> >+ <div id="[% table_id | html %]_search_results" style="display:none;"> > > <div id="info" class="dialog message" style="display: none;"></div> > <div id="error" class="dialog alert" style="display: none;"></div> >@@ -86,9 +86,9 @@ > > <input type="hidden" id="firstletter_filter" value="" /> > [% IF open_on_row_click %] >- <table id="[% table_id %]" class="selections-table"> >+ <table id="[% table_id | html %]" class="selections-table"> > [% ELSE %] >- <table id="[% table_id %]"> >+ <table id="[% table_id | html %]"> > [% END %] > <thead> > <tr> >@@ -202,7 +202,7 @@ > [% default_sort_column = "name" %] > [% END %] > [% SET order_column_index = 0 %] >- patrons_table = $("#[% table_id %]").kohaTable({ >+ patrons_table = $("#[% table_id | html %]").kohaTable({ > "ajax": { > [% SWITCH filter %] > [% CASE 'suggestions_managers' %] >@@ -433,7 +433,7 @@ > > function filter() { > $("#firstletter_filter").val(''); >- $("#[% table_id %]_search_results").show(); >+ $("#[% table_id | html %]_search_results").show(); > > let table_dt = patrons_table.DataTable(); > [% FOR c IN columns %] >@@ -457,7 +457,7 @@ > // User has clicked on a letter > function filterByFirstLetterSurname(letter) { > $("#firstletter_filter").val(letter); >- $("#[% table_id %]_search_results").show(); >+ $("#[% table_id | html %]_search_results").show(); > patrons_table.DataTable().draw(); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >index 620a9d73db..1374918a2a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >@@ -28,16 +28,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- [% PROCESS patron_search_js >- table_id => 'memberresultst', >- categories => categories, >- libraries => libraries, >- extended_attribute_types => extended_attribute_types, >- columns => columns, >- filter => filter, >- selection_type => selection_type, >- callback => callback >- %] >+ [% PROCESS patron_search_js table_id => 'memberresultst', categories => categories, libraries => libraries, extended_attribute_types => extended_attribute_types, columns => columns, filter => filter, selection_type => selection_type, callback => callback %] > [% END %] > > [% SET popup_window = 1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index b9ad43ce46..4c26daab88 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -1600,17 +1600,7 @@ > table_settings = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]; > </script> > >- [% PROCESS patron_search_js >- table_id => 'table_borrowers', >- categories => categories, >- libraries => libraries, >- extended_attribute_types => attribute_type_codes, >- columns => columns, >- open_on_row_click => 1, >- on_click_url => '/cgi-bin/koha/reserve/request.pl?' _ url_biblio_params, >- redirect_if_one_result => 1, >- redirect_url => '/cgi-bin/koha/reserve/request.pl?' _ url_biblio_params >- %] >+ [% PROCESS patron_search_js table_id => 'table_borrowers', categories => categories, libraries => libraries, extended_attribute_types => attribute_type_codes, columns => columns, open_on_row_click => 1, on_click_url => '/cgi-bin/koha/reserve/request.pl?' _ url_biblio_params, redirect_if_one_result => 1, redirect_url => '/cgi-bin/koha/reserve/request.pl?' _ url_biblio_params %] > <script> > $(document).ready(function() { > $("#holds_patronsearch").on("submit", filter); >-- >2.20.1
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 30093
:
130605
|
130606
|
130627
|
130628
|
130705
|
130944
|
130945
|
130946
|
131830
|
131831
|
131832
|
132537
|
132538
|
132540
|
132541
|
132542
|
132647
|
132648
|
132653
|
132654
|
132655
|
132699
|
132700
|
132701
|
132702
|
132724
|
132725
|
132726
| 132727 |
132728