@@ -, +, @@ --- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../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 +- 7 files changed, 17 insertions(+), 10 deletions(-) --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -425,5 +425,5 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch''s items to emphasize. If PatronBranch, emphasize the logged in user''s library''s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha''s Apache configuration file.','Choice'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free'); INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); -INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo'); +INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHoldNotes',0,'Show hold notes on OPAC','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo'); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -6983,6 +6983,13 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( SetVersion($DBversion); } +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("UPDATE systempreferences SET variable='OpacHoldNotes' WHERE variable='OpacShowHoldNotes'"); + print "Upgrade to $DBversion done (Bug 10343: Rename OpacShowHoldNotes to OpacHoldNotes)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/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 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ a/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 ) %]   --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ a/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 ) %] --- a/opac/opac-reserve.pl +++ a/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); --- a/opac/opac-user.pl +++ a/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; --