From 14783dabbee9817329c50972f18d63cf22b2edf2 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Tue, 24 Mar 2020 14:52:31 +0100 Subject: [PATCH] Bug 24819: (follow-up) Rename suggestion_search to suggestor_search Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- .../tables/{suggestion_search.tt => suggestor_search.tt} | 0 koha-tmpl/intranet-tmpl/prog/js/suggestions.js | 4 ++-- suggestion/{suggestion_search.pl => suggestor_search.pl} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/{suggestion_search.tt => suggestor_search.tt} (100%) rename suggestion/{suggestion_search.pl => suggestor_search.pl} (96%) 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 8a7ddf3f8e..2794a0abec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -378,7 +378,7 @@ [% INCLUDE 'date-format.inc' %] [% IF ( suggestedby_patron.borrowernumber ) %][% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %])[% END %] - Set to patron + Set to patron diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestion_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestor_search.tt similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestion_search.tt rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestor_search.tt diff --git a/koha-tmpl/intranet-tmpl/prog/js/suggestions.js b/koha-tmpl/intranet-tmpl/prog/js/suggestions.js index 613e967f7d..d884b6af09 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/suggestions.js +++ b/koha-tmpl/intranet-tmpl/prog/js/suggestions.js @@ -9,9 +9,9 @@ function select_user(borrowernumber, borrower) { } $(document).ready(function(){ - $('body').on('click', '#suggestion_search', function(e) { + $('body').on('click', '#suggestor_search', function(e) { e.preventDefault(); - var newin = window.open('suggestion_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top'); + var newin = window.open('suggestor_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top'); }); }); diff --git a/suggestion/suggestion_search.pl b/suggestion/suggestor_search.pl similarity index 96% rename from suggestion/suggestion_search.pl rename to suggestion/suggestor_search.pl index 24e33b7b7c..05a831fd01 100755 --- a/suggestion/suggestion_search.pl +++ b/suggestion/suggestor_search.pl @@ -48,7 +48,7 @@ my $patron_categories = Koha::Patron::Categories->search_limited; $template->param( view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results", columns => ['cardnumber', 'name', 'dateofbirth', 'address', 'action' ], - json_template => 'suggestion/tables/suggestion_search.tt', + json_template => 'suggestion/tables/suggestor_search.tt', selection_type => 'select', alphabet => ( C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ), categories => $patron_categories, -- 2.39.5