Bug 10343: Rename OpacShowHoldNotes to OpacHoldNotes

As QA followup on report 9722. Built on top of another followup report 10321.

Test plan:
Run the db revision included in the other patch.
Enable OpacHoldNotes. Check that you can add a hold note on opac-reserve.
Do you see it on opac-user and in staff on catalog detail of that biblio?
Do a grep on ShowHoldNotes on the Koha code: grep -i ignores case. You should
find three occurrences only in updatedatabase.pl (the old dbrev and this dbrev
renaming them). These are fine.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 81824e4..90295ef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -418,7 +418,7 @@ OPAC:
                 no: Don't display
             - the list of authors/subjects in a popup for a combined search on OPAC detail pages.
         -
-            - pref: OpacShowHoldNotes
+            - pref: OpacHoldNotes
               default: 0
               choices:
                   yes: Allow

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index acff3bc..42d85d4 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -272,7 +272,7 @@
         <th>Hold starts on date</th>
                  [% END %]
         <th>Hold not needed after</th>
-        [% IF ( OPACShowHoldNotes ) %]<th>Notes</th>[% END %]
+        [% IF ( OpacHoldNotes ) %]<th>Notes</th>[% END %]
                   [% IF ( OPACItemHolds ) %]
                     <th id="place_on_hdr" style="display:none">Place on</th>
                   [% END %]
@@ -359,7 +359,7 @@
       <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
     </td>[% END %]
 
-    [% IF ( OPACShowHoldNotes ) %][% IF ( bibitemloo.holdable ) %]<td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="shownotes" value="Edit notes"/></td>[% END %][% END %]
+    [% IF ( OpacHoldNotes ) %][% IF ( bibitemloo.holdable ) %]<td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="shownotes" value="Edit notes"/></td>[% END %][% END %]
 
                     [% IF ( bibitemloo.holdable ) %]
                    <!-- HOLD ABLE -->
@@ -437,7 +437,7 @@
                     [% END %]
                   </tr>
 
-                  [% IF ( OPACShowHoldNotes ) %]
+                  [% IF ( OpacHoldNotes ) %]
                   [% IF ( bibitemloo.holdable ) %]
                   <tr class="notesrow" id="notesrow_[% bibitemloo.biblionumber %]">
                       <td>&nbsp;</td>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index f1d3435..9ec4891 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -359,7 +359,7 @@ $.tablesorter.addParser({
             <thead><tr>
                 <th class="{sorter:'articles'}">Title</th>
                 <th>Placed on</th>
-                [% IF OpacShowHoldNotes %]<th>Notes</th>[% END %]
+                [% IF OpacHoldNotes %]<th>Notes</th>[% END %]
         <th>Expires on</th>
                 <th>Pick up location</th>
                [% IF ( showpriority ) %]
@@ -387,7 +387,7 @@ $.tablesorter.addParser({
                     [% RESERVE.author %]
                 </td>
                 <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
-                [% IF OpacShowHoldNotes %]<td class="reservenotes">[% RESERVE.reservenotes %]</td>[% END %]
+                [% IF OpacHoldNotes %]<td class="reservenotes">[% RESERVE.reservenotes %]</td>[% END %]
         <td class="expirationdate">[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
                 <td class="branch">[% RESERVE.branch %]</td>
                                [% IF ( showpriority ) %]

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index b633d3d..be72e84 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -556,8 +556,8 @@ if (! $template->{VARS}->{'singleBranchMode'}) {
     $itemTableColspan--;
 }
 $itemTableColspan-- if !$show_holds_count && !$show_priority;
-my $show_notes=C4::Context->preference('OPACShowHoldNotes');
-$template->param(OPACShowHoldNotes=>$show_notes);
+my $show_notes=C4::Context->preference('OpacHoldNotes');
+$template->param(OpacHoldNotes=>$show_notes);
 $itemTableColspan-- if !$show_notes;
 $template->param(itemtable_colspan => $itemTableColspan);
 

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index bb976f6..7b2f25e 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -364,7 +364,7 @@ $template->param(
 $template->param(
     SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
-    OpacShowHoldNotes => C4::Context->preference('OpacShowHoldNotes'),
+    OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;