Bug 24819: (follow-up) Rename suggestion_search to suggestor_search
authorMatthias Meusburger <matthias.meusburger@biblibre.com>
Tue, 24 Mar 2020 13:52:31 +0000 (14:52 +0100)
committerMartin Renvoize <martin.renvoize@ptfs-europe.com>
Mon, 20 Apr 2020 12:36:36 +0000 (13:36 +0100)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestion_search.tt [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestor_search.tt [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/js/suggestions.js
suggestion/suggestion_search.pl [deleted file]
suggestion/suggestor_search.pl [new file with mode: 0755]

index 8a7ddf3..2794a0a 100644 (file)
                 <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_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a>  [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.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="accepteddate">Accepted on:</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/suggestion_search.tt
deleted file mode 100644 (file)
index a82f0e8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[% USE raw %]
-[% USE To %]
-[% USE Branches %]
-[% USE KohaDates %]
-{
-    "sEcho": [% sEcho | html %],
-    "iTotalRecords": [% iTotalRecords | html %],
-    "iTotalDisplayRecords": [% iTotalDisplayRecords | html %],
-    "aaData": [
-        [% FOREACH data IN aaData %]
-            {
-                "dt_cardnumber":
-                    "[% data.cardnumber | html %]",
-                "dt_name":
-                    "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]",
-                "dt_dateofbirth":
-                    "[% data.dateofbirth | $KohaDates %]",
-                "dt_address":
-                    "[% INCLUDE escape_address data=data %]",
-                "dt_action":
-                    "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"borrower_data[% data.borrowernumber | html %]\" value=\"[% To.json(data) | html %]\" />"
-            }[% UNLESS loop.last %],[% END %]
-        [% END %]
-    ]
-}
-[% BLOCK escape_address %]
-[%~ SET address = data.streetnumber _ ' ' %]
-[%~ IF data.address %][% SET address = address _ data.address _ ' ' %][% END %]
-[%~ IF data.address2 %][% SET address = address _ data.address2 _ ' ' %][% END %]
-[%~ IF data.city %][% SET address = address _ data.city _ ' ' %][% END %]
-[%~ IF data.state %][% SET address = address _ data.state _ ' ' %][% END %]
-[%~ IF data.zipcode %][% SET address = address _ data.zipcode _ ' ' %][% END %]
-[%~ IF data.country %][% SET address = address _ data.country _ ' ' %][% END %]
-[%~ SET address = address _ Branches.GetName( data.branchcode ) %]
-[%~ To.json( address ) | $raw ~%]
-[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestor_search.tt
new file mode 100644 (file)
index 0000000..a82f0e8
--- /dev/null
@@ -0,0 +1,36 @@
+[% USE raw %]
+[% USE To %]
+[% USE Branches %]
+[% USE KohaDates %]
+{
+    "sEcho": [% sEcho | html %],
+    "iTotalRecords": [% iTotalRecords | html %],
+    "iTotalDisplayRecords": [% iTotalDisplayRecords | html %],
+    "aaData": [
+        [% FOREACH data IN aaData %]
+            {
+                "dt_cardnumber":
+                    "[% data.cardnumber | html %]",
+                "dt_name":
+                    "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]",
+                "dt_dateofbirth":
+                    "[% data.dateofbirth | $KohaDates %]",
+                "dt_address":
+                    "[% INCLUDE escape_address data=data %]",
+                "dt_action":
+                    "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"borrower_data[% data.borrowernumber | html %]\" value=\"[% To.json(data) | html %]\" />"
+            }[% UNLESS loop.last %],[% END %]
+        [% END %]
+    ]
+}
+[% BLOCK escape_address %]
+[%~ SET address = data.streetnumber _ ' ' %]
+[%~ IF data.address %][% SET address = address _ data.address _ ' ' %][% END %]
+[%~ IF data.address2 %][% SET address = address _ data.address2 _ ' ' %][% END %]
+[%~ IF data.city %][% SET address = address _ data.city _ ' ' %][% END %]
+[%~ IF data.state %][% SET address = address _ data.state _ ' ' %][% END %]
+[%~ IF data.zipcode %][% SET address = address _ data.zipcode _ ' ' %][% END %]
+[%~ IF data.country %][% SET address = address _ data.country _ ' ' %][% END %]
+[%~ SET address = address _ Branches.GetName( data.branchcode ) %]
+[%~ To.json( address ) | $raw ~%]
+[% END %]
index 613e967..d884b6a 100644 (file)
@@ -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/suggestion_search.pl
deleted file mode 100755 (executable)
index 24e33b7..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of Koha.
-#
-# Copyright 2020 BibLibre
-#
-# Koha is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# Koha is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Koha; if not, see <http://www.gnu.org/licenses>.
-
-use Modern::Perl;
-
-use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Output;
-use C4::Members;
-
-use Koha::Patron::Categories;
-
-my $input = new CGI;
-
-my $dbh = C4::Context->dbh;
-
-my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
-    {   template_name   => "common/patron_search.tt",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { suggestions => 'suggestions_manage' },
-    }
-);
-
-my $q = $input->param('q') || '';
-my $op = $input->param('op') || '';
-
-my $referer = $input->referer();
-
-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',
-    selection_type => 'select',
-    alphabet        => ( C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ),
-    categories      => $patron_categories,
-    aaSorting       => 1,
-);
-output_html_with_http_headers( $input, $cookie, $template->output );
diff --git a/suggestion/suggestor_search.pl b/suggestion/suggestor_search.pl
new file mode 100755 (executable)
index 0000000..05a831f
--- /dev/null
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Copyright 2020 BibLibre
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
+use C4::Auth;
+use C4::Output;
+use C4::Members;
+
+use Koha::Patron::Categories;
+
+my $input = new CGI;
+
+my $dbh = C4::Context->dbh;
+
+my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
+    {   template_name   => "common/patron_search.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { suggestions => 'suggestions_manage' },
+    }
+);
+
+my $q = $input->param('q') || '';
+my $op = $input->param('op') || '';
+
+my $referer = $input->referer();
+
+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/suggestor_search.tt',
+    selection_type => 'select',
+    alphabet        => ( C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ),
+    categories      => $patron_categories,
+    aaSorting       => 1,
+);
+output_html_with_http_headers( $input, $cookie, $template->output );