From 77c646a5db9995cfc9c9d3633103e8bededd9781 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 29 May 2013 16:19:27 +0200 Subject: [PATCH] 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 Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- .../prog/en/modules/admin/preferences/opac.pref | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt | 6 +++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- opac/opac-reserve.pl | 4 ++-- opac/opac-user.pl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) 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 81824e4702..90295ef6c9 100644 --- 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 acff3bc0c4..42d85d4ef0 100644 --- 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 @@ Hold starts on date [% END %] Hold not needed after - [% IF ( OPACShowHoldNotes ) %]Notes[% END %] + [% IF ( OpacHoldNotes ) %]Notes[% END %] [% IF ( OPACItemHolds ) %] Place on [% END %] @@ -359,7 +359,7 @@ Clear date

[% END %] - [% IF ( OPACShowHoldNotes ) %][% IF ( bibitemloo.holdable ) %][% END %][% END %] + [% IF ( OpacHoldNotes ) %][% IF ( bibitemloo.holdable ) %][% END %][% END %] [% IF ( bibitemloo.holdable ) %] @@ -437,7 +437,7 @@ [% END %] - [% IF ( OPACShowHoldNotes ) %] + [% IF ( OpacHoldNotes ) %] [% IF ( bibitemloo.holdable ) %]   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 f1d34353e8..9ec4891990 100644 --- 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({ Title Placed on - [% IF OpacShowHoldNotes %]Notes[% END %] + [% IF OpacHoldNotes %]Notes[% END %] Expires on Pick up location [% IF ( showpriority ) %] @@ -387,7 +387,7 @@ $.tablesorter.addParser({ [% RESERVE.author %] [% RESERVE.reservedate | $KohaDates %] - [% IF OpacShowHoldNotes %][% RESERVE.reservenotes %][% END %] + [% IF OpacHoldNotes %][% RESERVE.reservenotes %][% END %] [% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %] [% RESERVE.branch %] [% IF ( showpriority ) %] diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index b633d3d2ef..be72e84439 100755 --- 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 bb976f6eac..7b2f25eac7 100755 --- 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; -- 2.39.5