From cb54203994fc3f4077ca73162f24eea1e92a5356 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
---
 .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 2330e84779..74861c198b 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,19 @@ 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;" />
+                                <input type="text" name="remoteImage" size="48" maxlength="200" value="" onmousedown="document.getElementById('remote_image_check').checked = true;" />
                                 [% IF itemtype.imageurl %]
-                                    <img src="[% itemtype.imageurl | html %]" alt="" />
+                                    <img src="[% image_location | html %]" alt="" />
                                 [% END %]
                             </li>
                         </ul>
-- 
2.20.1