@@ -, +, @@
---
.../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(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc
+++ a/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 ? ' ' : '
';
[%~ 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 ~%]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -78,7 +78,7 @@
[% END %]
-
+
@@ -86,9 +86,9 @@
[% IF open_on_row_click %]
-
+
[% ELSE %]
-
+
[% END %]
@@ -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();
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
@@ -28,16 +28,7 @@
[% 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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1600,17 +1600,7 @@
table_settings = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %];
- [% 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 %]