From 597240e878a2a9808ce103508a42d9ed34a11422 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 25 Aug 2011 15:37:25 -0400
Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation
 processing

Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../opac-tmpl/prog/en/modules/opac-reserve.tt | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 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 5c38ed4712..ca491522cc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -428,17 +428,28 @@
                         [% IF ( bibitemloo.holdable ) %]
 			    [% IF ( choose_branch ) %]
 			                   <td>
-                                              <select name="branch" id="branch_[% bibitemloo.biblionumber %]"
-                                                [% UNLESS ( bibitemloo.holdable ) %]disabled="disabled"[% END %] >
-                                                [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
-                                                  [% IF ( branchChoicesLoo.selected ) %]
-                                                    <option value="[% branchChoicesLoo.value %]" selected="selected">[% branchChoicesLoo.branchname %]</option>
-                                                  [% ELSE %]
-                                                    <option value="[% branchChoicesLoo.value %]">[% branchChoicesLoo.branchname %]</option>
-                                                  [% END %]
-                                                [% END %]
-                                              </select>
-                                           </td>
+                         [% UNLESS ( bibitemloo.holdable ) %]
+                            <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
+                              [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
+                                [% IF ( branchChoicesLoo.selected ) %]
+                                  <option value="[% branchChoicesLoo.value %]" selected="selected">[% branchChoicesLoo.branchname %]</option>
+                                [% ELSE %]
+                                  <option value="[% branchChoicesLoo.value %]">[% branchChoicesLoo.branchname %]</option>
+                                [% END %]
+                              [% END %]
+                          </select>
+                          [% ELSE %]
+                            <select name="branch" id="branch_[% bibitemloo.biblionumber %]">
+                              [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
+                                [% IF ( branchChoicesLoo.selected ) %]
+                                  <option value="[% branchChoicesLoo.value %]" selected="selected">[% branchChoicesLoo.branchname %]</option>
+                                [% ELSE %]
+                                  <option value="[% branchChoicesLoo.value %]">[% branchChoicesLoo.branchname %]</option>
+                                [% END %]
+                              [% END %]
+                            </select>
+                          [% END %]
+                       </td>
 			    [% END %]
 		        [% END %]
                     [% END %]
-- 
2.39.5