]> git.koha-community.org Git - koha.git/commit
Bug 5786 - Move AllowOnShelfHolds and OPACItemHolds system prefs to the Circulation...
authorSrdjan <srdjan@catalyst.net.nz>
Mon, 25 Feb 2013 03:43:00 +0000 (16:43 +1300)
committerTomas Cohen Arazi <tomascohen@gmail.com>
Wed, 25 Mar 2015 13:33:14 +0000 (10:33 -0300)
commit1802aa91530a4e8716da4a6b956ca6e0cee7d471
treef45b7a72a2c9bbb333400ca6ed40e3cc101571b5
parentd149cd1d977ab796edd5da9881f08bac251c54e1
Bug 5786 - Move AllowOnShelfHolds and OPACItemHolds system prefs to the Circulation Matrix

C4::Reserves:
* Added OnShelfHoldsAllowed() to check issuingrules
* Added OPACItemHoldsAllowed() to check issuingrules
* IsAvailableForItemLevelRequest() changed interface, now takes
  $item_record,$borrower_record; calls OnShelfHoldsAllowed()

opac/opac-reserve.pl and opac/opac-search.pl:
* rewrote hold allowed rule to use OPACItemHoldsAllowed()
* also use OnShelfHoldsAllowed() through
* IsAvailableForItemLevelRequest()

templates:
* Removed AllowOnShelfHolds and OPACItemHolds global flags, they now
  only have meaning per item type

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
I have tested this patch left, right and upside down for the last
several months. All tests have passed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
30 files changed:
C4/Auth.pm
C4/Circulation.pm
C4/ILSDI/Services.pm
C4/Items.pm
C4/Reserves.pm
C4/UsageStats.pm
C4/VirtualShelves/Page.pm
admin/smart-rules.pl
installer/data/mysql/it-IT/necessari/system_preferences.sql
installer/data/mysql/kohastructure.sql
installer/data/mysql/sysprefs.sql
installer/data/mysql/updatedatabase.pl
installer/html-template-to-template-toolkit.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
opac/opac-ISBDdetail.pl
opac/opac-MARCdetail.pl
opac/opac-detail.pl
opac/opac-reserve.pl
opac/opac-search.pl
reserve/request.pl
t/db_dependent/Circulation.t
t/db_dependent/Circulation_Issuingrule.t
t/db_dependent/Reserves.t