From fc35a58472e878ae0a408309d9ed5e47704c439a Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 2 May 2024 16:05:35 +0000
Subject: [PATCH] Bug 30579: Fix rebase issue

---
 .../prog/en/modules/reserve/request.tt         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 3951c7c3235..6a2a696d799 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -690,9 +690,9 @@
 
                         <hr/>
 
-                        [% biblio = biblioloop.0 %]
+                        [% biblio_info = biblioloop.0 %]
                         <!-- ItemGroup level holds -->
-                        [% IF Koha.Preference('EnableItemGroupHolds') && biblio.object.item_groups.count %]
+                        [% IF Koha.Preference('EnableItemGroupHolds') && biblio_info.object.item_groups.count %]
                         <fieldset class="rows">
                             <legend>
                                 <label for="requestgrp" class="inline">
@@ -740,7 +740,7 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                [% FOREACH g IN biblio.object.item_groups.search({}, { order_by => ['display_order'] }) %]
+                                                [% FOREACH g IN biblio_info.object.item_groups.search({}, { order_by => ['display_order'] }) %]
                                                     [% IF g.items.count %]
                                                         <tr>
                                                             <td>
@@ -790,7 +790,6 @@
                         [% END %]
                         <!-- /ItemGroup level holds -->
 
-
                         <fieldset class="rows">
                             <legend>
                                 <label for="requestspecificitem" class="inline">
@@ -1034,6 +1033,17 @@
                                             <a href="request.pl?biblionumber=[% biblio_info.biblionumber | uri %]&amp;borrowernumber=[% borrowernumber | uri %]&amp;showallitems=1">Show all items ([% hiddencount | html %] hidden)</a>
                                         </p>
                                 [% END # /IF hiddencount %]
+                                <fieldset class="action">
+                                    [% IF ( patron.borrowernumber ) %]
+                                        [% IF ( override_required ) %]
+                                            <button type="submit" id="hold_item_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
+                                        [% ELSIF ( none_available ) %]
+                                            <button type="submit" id="hold_item_btn" disabled="disabled" class="btn btn-primary btn-disabled">Place hold</button>
+                                        [% ELSE %]
+                                            <button type="submit" id="hold_item_btn" class="btn btn-primary">Place hold</button>
+                                        [% END %]
+                                    [% END %]
+                                </fieldset>
 
                             [% ELSE # /UNLESS multi_hold %]
                                 <fieldset class="rows">
-- 
2.39.2