Attachment 101788 Details for Bug 24819 – follow-up

[patch] follow-up

attachment.cgi?id=101583 (text/plain), 4.09 KB, created by Matthias Meusburger on 2020-03-26 09:25:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Meusburger

Created: 2020-03-26 09:25:32 UTC

Size: 4.09 KB

patch

obsolete

>From cf2f99bc661a7b79c26025f420d5075e32a502c0 Mon Sep 17 00:00:00 2001
>From: Matthias Meusburger <matthias.meusburger@biblibre.com>
>Date: Tue, 24 Mar 2020 14:52:31 +0100
>Subject: [PATCH] Bug 24819: (follow-up) Rename suggestion_search to
> suggestor_search
>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt      | 2 +-
> .../suggestion/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 3e3a806..1436eb2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -370,7 +370,7 @@
>                 <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td>
>                 <td id="tdsuggestedby"><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a>  [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %]
>                 </td>
>-                <td><a href="#" id="suggestion_search" class="btn btn-default">Set to patron</a></td>
>+                <td><a href="#" id="suggestor_search" class="btn btn-default">Set to patron</a></td>
>             </tr>
>             <tr>
>                 <th><label for="managedon">Managed by:</label> </th>
>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 613e967..d884b6a 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 24e33b7..05a831f 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.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 24819: 100223 | 100281 | 101583 | 101716 | 101788 | 101789 | 103197 | 103198 | 103199