bug 4396: remove reerences to bi_notforloan

These were causing the OPAC details place hold button to disappear
in circumstances where a bib-level item type was set to a non-loanable
item type even when item-level_itypes was on.

This change does mean that if item-level_itypes is not turned on,
the hold button will now appear for bibs whose bib-level item type
has its not-for-loan flag set; however, if this is a problem, a
better long-term fix would be to use CanBookBeReserved() instead.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 83cad83..eda7985 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -174,8 +174,7 @@ function confirm_items_deletion() {
        <li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
        <li id="printbiblioc"><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
        <!-- TMPL_IF NAME="CAN_user_reserveforothers" -->
-        <!-- TMPL_UNLESS name="bi_notforloan" -->
-       <!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
+       <!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_UNLESS -->
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="PopupZ3950(); return false;" /></li><!-- /TMPL_IF -->
     </ul>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index d7fb2b0..039e2ea 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -47,7 +47,6 @@
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
-    <!-- TMPL_UNLESS name="bi_notforloan" -->
         <!-- TMPL_IF NAME="opacuserlogin" -->
                <!-- TMPL_IF NAME="RequestOnOpac" -->
                        <!-- TMPL_IF NAME="AllowOnShelfHolds" -->
@@ -60,7 +59,6 @@
 
                <!-- /TMPL_IF -->
        <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
 <!-- /TMPL_UNLESS -->
         <li><a class="print" href="javascript:window.print();">Print</a></li>
 <!-- TMPL_IF name="virtualshelves" -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index 68777ac..319d0d7 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -162,7 +162,6 @@
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
-    <!-- TMPL_UNLESS name="bi_notforloan" -->
         <!-- TMPL_IF NAME="opacuserlogin" -->
                <!-- TMPL_IF NAME="RequestOnOpac" -->
                        <!-- TMPL_IF NAME="AllowOnShelfHolds" -->
@@ -175,7 +174,6 @@
 
                <!-- /TMPL_IF -->
        <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
 <!-- /TMPL_UNLESS -->
         <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
             Print

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index d7a4cce..d0967d2 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -755,7 +755,6 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
-    <!-- TMPL_UNLESS name="bi_notforloan" -->
         <!-- TMPL_IF NAME="opacuserlogin" -->
                <!-- TMPL_IF NAME="RequestOnOpac" -->
                        <!-- TMPL_IF NAME="AllowOnShelfHolds" -->
@@ -767,7 +766,6 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
                        <!-- /TMPL_IF -->
                <!-- /TMPL_IF -->
        <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
 <!-- /TMPL_UNLESS -->
         <li><a class="print" href="javascript:window.print();">Print</a></li>
 <!-- TMPL_IF name="virtualshelves" -->