From c8493641339a55ebf48772dd696c8c9fa3b40404 Mon Sep 17 00:00:00 2001 From: Srdjan Date: Fri, 30 Mar 2012 13:00:41 +1300 Subject: [PATCH] bug_7398: Replaced OPACDisplayRequestPriority syspref with OPACShowHoldQueueDetails New syspref is Choice, options being: - None - Holds number only - Holds number and priority Show holds count on OPAC detail --- admin/systempreferences.pl | 2 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 13 ++++ .../prog/en/modules/admin/preferences/opac.pref | 9 ++- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 17 ++++++ .../opac-tmpl/prog/en/modules/opac-reserve.tt | 52 +++++++++-------- opac/opac-detail.pl | 21 +++++++ opac/opac-reserve.pl | 60 +++++++++++--------- opac/opac-user.pl | 11 ++- 9 files changed, 125 insertions(+), 62 deletions(-) diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index f4069ae..ebc52de 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -348,7 +348,7 @@ $tabsysprefs{OPACViewOthersSuggestions} = "OPAC"; $tabsysprefs{URLLinkText} = "OPAC"; $tabsysprefs{OPACSearchForTitleIn} = "OPAC"; $tabsysprefs{OPACShelfBrowser} = "OPAC"; -$tabsysprefs{OPACDisplayRequestPriority} = "OPAC"; +$tabsysprefs{OPACShowHoldQueueDetails} = "OPAC"; $tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC"; $tabsysprefs{OPACPatronDetails} = "OPAC"; $tabsysprefs{OPACFinesTab} = "OPAC"; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 34ac684..aa6affb 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -233,7 +233,7 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('CurrencyFormat','US','US|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\' in \'FR\' or \'360,000.00\' in \'US\'.','Choice'); INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('AcqCreateItem','ordering','ordering|receiving|cataloguing','Define when the item is created : when ordering, when receiving, or in cataloguing module','Choice'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowRenewalLimitOverride', '0', 'if ON, allows renewal limits to be overridden on the circulation screen',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('OPACDisplayRequestPriority','0','','Show patrons the priority level on holds in the OPAC','YesNo'); +INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('OPACShowHoldQueueDetails','none','none|holds|holds_priority','Show holds details in OPAC','Choice'); INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'UseBranchTransferLimits', '0', '', 'If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.', 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowHoldPolicyOverride', '0', 'Allow staff to override hold policies when placing holds',NULL,'YesNo'); INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'BranchTransferLimitsType', 'ccode', 'itemtype|ccode', 'When using branch transfer limits, choose whether to limit by itemtype or collection code.', 'Choice'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index c297677..59c9d21 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5136,6 +5136,19 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTResultsDisplay\" WHERE variable='OPACXSLTResultsDisplay'"); } print "XSLT systempreference takes a path to file rather than YesNo\n"; +} + + +$DBversion = "3.07.00.XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("UPDATE systempreferences SET + variable = 'OPACShowHoldQueueDetails', + value = CASE value WHEN '1' THEN 'holds_priority' ELSE 'none' END, + options = 'none|holds|holds_priority', + explanation = 'Show holds details in OPAC', + type = 'Choice' + WHERE variable = 'OPACDisplayRequestPriority'"); + print "Upgrade to $DBversion done (Changed system preference OPACDisplayRequestPriority -> OPACShowHoldQueueDetails)\n"; SetVersion($DBversion); } 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 a871399..9976443 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 @@ -71,11 +71,12 @@ OPAC: no: "Don't include" - "COinS / OpenURL / Z39.88 in OPAC search results.
Warning: Enabling this feature will slow OPAC search response times." - - - pref: OPACDisplayRequestPriority + - pref: OPACShowHoldQueueDetails choices: - yes: Show - no: "Don't show" - - patrons the priority level of their holds in the OPAC. + none: "Don't show any hold details" + holds: "Show holds" + holds_priority: "Show holds and their priority level" + - to patrons in the OPAC. - - pref: OPACShowCheckoutName default: 0 diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index a5be324..c72ab82 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -629,6 +629,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () { Status [% IF ( itemdata_itemnotes ) %]Notes[% END %] Date Due + [% IF holds_count.defined %] + Holds + [% END %] [% FOREACH ITEM_RESULT IN ITEM_RESULTS %] [% IF ( item_level_itypes ) %][% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %][% ITEM_RESULT.description %][% END %][% END %] [% ITEM_RESULT.description %][% END %] @@ -653,10 +656,24 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% INCLUDE 'item-status.inc' item = ITEM_RESULT %] [% IF ( itemdata_itemnotes ) %][% ITEM_RESULT.itemnotes %][% END %] [% ITEM_RESULT.datedue | $KohaDates %] + [% IF holds_count.defined %] + [% ITEM_RESULT.holds_count %] + [% IF ITEM_RESULT.priority %] + (priority [% ITEM_RESULT.priority %]) + [% END %] + + [% END %] [% END %] [% END %] + [% IF holds_count.defined %] +
Holds: [% holds_count %] + [% IF priority %] + (priority [% priority %]) + [% END %] +
+ [% END %] [% ELSE %] [% IF ( ALTERNATEHOLDINGS ) %] [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %] 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 7597a4a..43e4e36 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -242,8 +242,12 @@ [% UNLESS ( item_level_itypes ) %] Item Type [% END %] - [% IF ( showpriority ) %] - Priority + [% IF ( showholds ) %] + Holds + [% IF ( showpriority ) %] + and priority + [% END %] + [% END %] [% IF ( reserve_in_future ) %] Hold Starts on Date @@ -297,19 +301,21 @@ [% END %] - [% IF ( bibitemloo.holdable ) %][% UNLESS ( item_level_itypes ) %] - - [% IF ( bibitemloo.imageurl ) %][% END %] - [% bibitemloo.description %] - - [% END %][% END %] [% IF ( bibitemloo.holdable ) %] - [% IF ( showpriority ) %] - - [% bibitemloo.rank %] out of [% bibitemloo.reservecount %] - [% END %][% END %] - [% IF ( reserve_in_future ) %] - [% IF ( bibitemloo.holdable ) %] + + [% UNLESS ( item_level_itypes ) %] + + [% IF ( bibitemloo.imageurl ) %][% END %] + [% bibitemloo.description %] + + [% END %] + [% IF showholds %] + + [% IF ( showpriority ) %] [% bibitemloo.rank %] out of [% END %][% bibitemloo.reservecount %] + + [% END %] + [% IF ( reserve_in_future ) %] +

Clear Date

- [% END %] - - [% END %] - [% IF ( bibitemloo.holdable ) %] + + [% END %] + Show Calendar

Clear Date

- [% END %] - - [% IF ( bibitemloo.holdable ) %] - - [% IF ( OPACItemHolds ) %] - - + + [% IF ( OPACItemHolds ) %] + +