From 29ce699cb4d1922f6214472705a430c0502ead9a Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 18 Dec 2014 11:59:13 +0100 Subject: [PATCH] Bug 13478: Force item holds only for specific biblios Content-Type: text/plain; charset=utf-8 This patch adds the option to selectively force item holds for specific biblionumbers. These numbers are saved in a separate table. The patch adds routine C4::Reserves::CheckBiblioForceItemHolds. It is tested in Reserves.t. The preference OPACItemHolds gets a new choice: selectiveforce. The description of the pref is adjusted. Please note that this option is specifically targeted for the OPAC. Staff users still have both possibilities. A follow-up patch adds the possibility for staff users to add or remove a biblio from the list of books with forced item holds. TEST PLAN: [ 1] Run the unit test t/db_dependent/Reserves.t. [ 2] Set OPACItemHolds to force. [ 3] Add a hold in the OPAC; verify that you cannot place a next/av hold. [ 4] Set OPACItemHolds to Allow. [ 5] Add a hold in the OPAC; verify that you can place both hold types. [ 6] Set OPACItemHolds to Do not allow. [ 7] Add a hold in the OPAC; verify that you can only place next/av holds. [ 8] Add two biblio numbers into table biblio_force_item_holds. [ 9] Set OPACItemHolds to Selectively force. [10] Add a hold on three biblionumbers at once (including these two). Verify that you have two hold types for the single biblio and that you have only item holds for the two other biblios. --- C4/Reserves.pm | 17 ++++++ Koha/Schema/Result/BiblioForceItemHold.pm | 53 ++++++++++++++++++++ installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 3 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 22 +++++---- opac/opac-reserve.pl | 3 + t/db_dependent/Reserves.t | 19 +++++++- 7 files changed, 106 insertions(+), 13 deletions(-) create mode 100644 Koha/Schema/Result/BiblioForceItemHold.pm diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 22a9ecb..c054d1e 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -2440,6 +2440,23 @@ sub IsItemOnHoldAndFound { return $found; } +=head2 CheckBiblioForceItemHolds + + This subroutine returns true if item holds are forced for each biblio + by OPACItemHolds. If this pref is set to selective, the biblio should + be found in the designated table. + In other cases it returns undef. + +=cut + +sub CheckBiblioForceItemHolds { + my ( $biblionumber ) = @_; + return 1 if C4::Context->preference('OPACItemHolds') eq 'force'; + return if C4::Context->preference('OPACItemHolds') ne 'selectiveforce'; + my $rs = Koha::Database->new()->schema()->resultset('BiblioForceItemHold'); + return 1 if $rs->find( $biblionumber ); +} + =head1 AUTHOR Koha Development Team diff --git a/Koha/Schema/Result/BiblioForceItemHold.pm b/Koha/Schema/Result/BiblioForceItemHold.pm new file mode 100644 index 0000000..7a11232 --- /dev/null +++ b/Koha/Schema/Result/BiblioForceItemHold.pm @@ -0,0 +1,53 @@ +use utf8; +package Koha::Schema::Result::BiblioForceItemHold; + +# Created by DBIx::Class::Schema::Loader +# DO NOT MODIFY THE FIRST PART OF THIS FILE + +=head1 NAME + +Koha::Schema::Result::BiblioForceItemHold + +=cut + +use strict; +use warnings; + +use base 'DBIx::Class::Core'; + +=head1 TABLE: C + +=cut + +__PACKAGE__->table("biblio_force_item_holds"); + +=head1 ACCESSORS + +=head2 biblionumber + + data_type: 'integer' + is_nullable: 0 + +=cut + +__PACKAGE__->add_columns("biblionumber", { data_type => "integer", is_nullable => 0 }); + +=head1 PRIMARY KEY + +=over 4 + +=item * L + +=back + +=cut + +__PACKAGE__->set_primary_key("biblionumber"); + + +# Created by DBIx::Class::Schema::Loader v0.07036 @ 2014-12-18 10:00:44 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fJDe98uyvYlbqjrElzM/rQ + + +# You can replace this text with custom code or comments, and it will be preserved on regeneration +1; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 89707ef..0f62230 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -262,7 +262,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpacHiddenItems','','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','Textarea'), ('OpacHighlightedWords','1','','If Set, then queried words are higlighted in OPAC','YesNo'), ('OpacHoldNotes','0','','Show hold notes on OPAC','YesNo'), -('OPACItemHolds','1','0|1|force','Allow OPAC users to place hold on specific items. If No, users can only request next available copy. If Yes, users can choose between next available and specific copy. If Force, users *must* choose a specific copy.','Choice'), +('OPACItemHolds','1','0|1|force|selectiveforce','Allow OPAC users to place hold on specific items. If No, users can only request next available copy. If Yes, users can choose between next available and specific copy. If Force, users *must* choose a specific copy. Selectiveforce works on specific biblios.','Choice'), ('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'), ('OPACItemsResultsDisplay','0','','If OFF : show only the status of items in result list.If ON : show full location of items (branch+location+callnumber) as in staff interface','YesNo'), ('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL), 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 f0c0951..1205439 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 @@ -499,7 +499,8 @@ OPAC: no: "Don't allow" yes: Allow force: Force - - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item. If this is forced, users must put a hold on a specific item. + selectiveforce: Selectively force + - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item. If this is forced, users must put a hold on a specific item. The 'selective force'-option works with a list of biblios with forced item holds. - - pref: OpacRenewalAllowed choices: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 6558e6e..f5def52 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -119,7 +119,7 @@
[% FOREACH bibitemloo IN bibitemloop %] -
+

[% IF ( bibitemloo.holdable ) %] @@ -243,7 +243,7 @@ [% END # / IF OpacHoldNotes %] - [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] + [% IF OPACItemHolds %]