From 0bc8fc2787a5ef29638094a0a7ec7b47be636ae1 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 11 Oct 2019 14:18:58 +0100
Subject: [PATCH] Bug 23804: Correctly catch remote itemtype images

Bug 20216 missed the mark and although it did start display a URL for
the itemtype image in use, it was not limited to remote urls and as such
broke the checked handling for displaying which local image was
selected.

Test plan:
1) Select a local image for an itemtype.
2) Check the correct image is displayed in the admin table.
3) Edit the itemtype checking that the correct image is checked.
4) Change to a remote image for the itemtype
5) Check the correct image is displayed in the admin table.
6) Edit the itemtype again and check that the URL still displays and is
   checked in the 'Remote image' tab.
7) Signoff

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 2f8c8986aa..7bff5dddaa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -195,14 +195,16 @@ Item types administration
                         <ul>
                             <li>
                                 <label for="remote_image_check"> Remote image:</label>
-                                [% IF itemtype.imageurl %]
+                                [% SET image_location = itemtype.image_location('intranet') %]
+                                [% IF image_location.match('^http') %]
                                     <input type="radio" id="remote_image_check" name="image" value="remoteImage" checked="checked" />
+                                    <input type="text" name="remoteImage" size="48" maxlength="200" value="[% image_location | html %]" onmousedown="document.getElementById('remote_image_check').checked = true;" />
+                                    [% IF itemtype.imageurl %]
+                                        <img src="[% image_location | html %]" alt="" />
+                                    [% END %]
                                 [% ELSE %]
                                     <input type="radio" id="remote_image_check" name="image" value="remoteImage" />
-                                [% END %]
-                                <input type="text" name="remoteImage" size="48" maxlength="200" value="[% itemtype.imageurl | html %]" onmousedown="document.getElementById('remote_image_check').checked = true;" />
-                                [% IF itemtype.imageurl %]
-                                    <img src="[% itemtype.imageurl | html %]" alt="" />
+                                    <input type="text" name="remoteImage" size="48" maxlength="200" value="" onmousedown="document.getElementById('remote_image_check').checked = true;" />
                                 [% END %]
                             </li>
                         </ul>
-- 
2.39.5