From 1722b3c9c81025141c637a3ebb9ec0fc4eef00fa Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Wed, 17 Oct 2012 11:42:53 +0200
Subject: [PATCH] Bug 7825: Followup prevent submission without choosing an
 item

---
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   24 ++++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

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 fad0165..8a6d270 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -31,7 +31,9 @@
     $(".copiesrow").hide();
 
     $("#place_on_hdr").show();
-    $(".place_on_type").show();
+    [% IF OPACItemHolds == 'yes' %]
+        $(".place_on_type").show();
+    [% END %]
 
     // Replace non-JS single-selection with multi-selection capability.
     $(".reserve_mode").val("multi");
@@ -147,7 +149,6 @@
 
         $("#selections").val(selections);
         $("#biblionumbers").val(biblionumbers);
-
         return true;
     });
 
@@ -341,7 +342,7 @@
 
                     [% IF ( bibitemloo.holdable ) %]
 		    <!-- HOLDABLE -->
-		        [% IF OPACItemHolds == 'yes' %]
+		        [% IF OPACItemHolds == 'yes' or OPACItemHolds == 'force' %]
 		        <!-- ITEM HOLDS -->
                                           <td class="place_on_type" style="display:none">
                                             <ul>
@@ -350,7 +351,7 @@
                                                            id="reqany_[% bibitemloo.biblionumber %]"
                                                            class="selectany"
                                                            value="Any"
-                                                           checked="checked"
+                                                           [% IF OPACItemHolds == "yes" %]checked="checked"[% END %]
                                                     />
                                                     <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
                                                 </li>
@@ -359,18 +360,21 @@
                                                            id="reqspecific_[% bibitemloo.biblionumber %]"
                                                            class="selectspecific"
                                                            value="Specific"
+                                                           [% IF OPACItemHolds == "force" %]checked="checked"[% END %]
                                                     />
                                                     <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
                                                 </li>
                                             </ul>
                                           </td>
-		        [% ELSIF OPACItemHolds == 'force' %]
-<script type="text/javascript">
-    $(document).ready(function() {
-        $("#copiesrow_[% bibitemloo.biblionumber %]").show();
-    });
-</script>
+                        [% IF OPACItemHolds == 'force' %]
+                            <script type="text/javascript">
+                                $(document).ready(function() {
+                                    $("#copiesrow_[% bibitemloo.biblionumber %]").show();
+                                });
+                            </script>
                         [% END %]
+                    [% END %]
+
                     [% END  # holdable%]
                     [% UNLESS ( singleBranchMode ) %]
                         [% IF ( bibitemloo.holdable ) %]
-- 
1.7.10.4