From 8ff46c33e6e1b3e4a59ef2956404a6ba6ba30ca2 Mon Sep 17 00:00:00 2001
From: Barry Cannon <barry@oslo.ie>
Date: Mon, 18 Nov 2013 16:33:45 +0000
Subject: [PATCH] Bug 6837 - When AllowOnShelfHolds is OFF then holds on
 records with available items should not be possible

The original "AllowOnShelfHolds" SysPref had two options:
"Allow" and "Don't Allow". When the preference was set to "Don't Allow" the system 
would still allow a hold to be placed on a bib if at least one of it's items was not
on the shelf. This violated the SystemPreference.

When this patch is implemented, and the "AllowShelfHolds" SysPref is set to "Don't Allow"
the system will not provide a "Place Hold" option to the OPAC user if ANY item is on
the shelf (in ANY location). Setting the SysPref to "Allow" will allow holds to be placed
on the bib if there is an attached item on the shelf.

---
 koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc |    4 ----
 koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt  |    4 ----
 koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt          |    4 ----
 3 files changed, 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
index 0f16f3a..634fb95 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
@@ -4,10 +4,6 @@
             [% IF ( RequestOnOpac ) %]
                 [% IF ( AllowOnShelfHolds ) %]
                     <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                [% ELSE %]
-                    [% IF ( ItemsIssued ) %]
-                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                    [% END %]
                 [% END %]
             [% END %]
         [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
index 2010cee..83d4a61 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
@@ -275,10 +275,6 @@ function highlightOn() {
 						[% IF ( opacuserlogin ) %]
 							[% IF ( AllowOnShelfHolds ) %]
                                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-							[% ELSE %]
-								[% IF ( GROUP_RESULT.itemsissued ) %]
-                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-								[% END %]
 							[% END %]
 						[% END %]
 					[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 9235b2b..5598ca1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -669,10 +669,6 @@ $(document).ready(function(){
                         [% IF ( opacuserlogin ) %]
                             [% IF ( AllowOnShelfHolds ) %]
                                 <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                            [% ELSE %]
-                                [% IF ( SEARCH_RESULT.itemsissued ) %]
-                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                                [% END %]
                             [% END %]
                         [% END %]
                     [% END %]
-- 
1.7.10.4