From 971981e413c1593b2100b080e80ed2690cdab566 Mon Sep 17 00:00:00 2001
From: PTFS Europe <hosting@ptfs-europe.com>
Date: Fri, 7 Jul 2017 15:31:12 +0100
Subject: [PATCH] Bug 7374: Can't upload icon for auth values

Fixes a bug which prevents the delivered images being selected.
---
 .../prog/en/modules/admin/authorised_values.tt     | 69 ++++++++++++----------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index c105f4e..dc9d388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -123,36 +123,45 @@ $(document).ready(function() {
         <h5 style="margin-left:10px;">Choose an icon:</h5>
 			<ul>
                   <li><a href="#none">None</a></li>
-				  [% FOREACH imageset IN imagesets %]
-                        [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
-				  [% END %]
-      [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
-			</ul>
-  <div id="none"><ul>
-  <li><label for="noimage">No image: </label><input type="radio" name="imageurl" id="noimage" value="removeImage" /></li>
-  </ul>
-  <br class="clear" /></div>
-  [% FOREACH imageset IN imagesets %]
-  <div id="[% imageset.imagesetname %]"><ul>
-  [% FOREACH image IN imageset.images %]
-			<li style="float: none; display: inline-block; clear : none; width: auto;">
-            <label> [% IF ( image.StaffImageUrl ) %]
-              <img src="[% image.StaffImageUrl %]" alt="[% image.StaffImageUrl %]" title="[% image.StaffImageUrl %]" />
-        [% ELSE %]
-        [% END %]
-    [% IF ( image.checked ) %]
-              <input type="radio" name="imageurl" value="[% image.KohaImage %]" checked="checked" />
-    [% ELSE %]
-              [% IF ( image.KohaImage ) %] <!-- to delete the radio button if there is no image after -->
-              <input type="radio" name="imageurl" value="[% image.KohaImage %]" />
-              [% END %]
-    [% END %]
-            </label>
-			</li>
-  [% END %]</ul>
-  <br class="clear" />
-  </div>
-  [% END %]
+[% FOREACH imageset IN imagesets %]
+                            [% IF ( imageset.imagesetactive ) %]
+                                <li class="ui-tabs-active">
+                            [% ELSE %]
+                                <li>
+                            [% END %]
+                            <a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a>
+                            </li>
+                        [% END %]
+                        [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
+                    </ul>
+                    <div id="none">
+                        <ul>
+                            <li><label for="noimage">No image: </label><input type="radio" name="image" id="noimage" value="removeImage" /></li>
+                        </ul>
+                        <br class="clear" />
+                    </div>
+
+                    [% FOREACH imageset IN imagesets %]
+                        <div id="[% imageset.imagesetname %]">
+                            <ul>
+                                [% FOREACH image IN imageset.images %]
+                                    <li style="float: none; display: inline-block; clear : none; width: auto;">
+                                        <label>
+                                            [% IF image.StaffImageUrl %]
+                                                <img src="[% image.StaffImageUrl %]" alt="[% image.StaffImageUrl %]" title="[% image.StaffImageUrl %]" />
+                                            [% END %]
+                                            [% IF image.checked %]
+                                                <input type="radio" name="image" value="[% image.KohaImage %]" checked="checked" />
+                                            [% ELSIF image.KohaImage %] <!-- to delete the radio button if there is no image after -->
+                                                <input type="radio" name="image" value="[% image.KohaImage %]" />
+                                            [% END %]
+                                        </label>
+                                    </li>
+                                [% END %]
+                            </ul>
+                            <br class="clear" />
+                        </div>
+                    [% END %]
 
 <div id="remote">
                         <ul>
-- 
2.1.4