Bug 24819: (follow-up) Rename suggestor to suggester

I believe I suggested a typo - trying to fix it here.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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 2794a0a..800d7dd 100644 (file)
--- 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 @@
                 <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="suggestor_search" class="btn btn-default">Set to patron</a></td>
+                <td><a href="#" id="suggester_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/suggestor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggester_search.tt
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestor_search.tt
rename to koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggester_search.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/js/suggestions.js b/koha-tmpl/intranet-tmpl/prog/js/suggestions.js
index d884b6a..cff05bd 100644 (file)
--- 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', '#suggestor_search', function(e) {
+    $('body').on('click', '#suggester_search', function(e) {
         e.preventDefault();
-        var newin = window.open('suggestor_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
+        var newin = window.open('suggester_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
     });
 
 });

diff --git a/suggestion/suggestor_search.pl b/suggestion/suggester_search.pl
similarity index 96%
rename from suggestion/suggestor_search.pl
rename to suggestion/suggester_search.pl
index 05a831f..bdbb281 100755 (executable)
--- a/suggestion/suggestor_search.pl
+++ b/suggestion/suggester_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/suggestor_search.tt',
+    json_template => 'suggestion/tables/suggester_search.tt',
     selection_type => 'select',
     alphabet        => ( C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ),
     categories      => $patron_categories,