From e4301a52b83ca24876ff58fd78bee863df5ce398 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 15 Feb 2018 17:05:29 +0000
Subject: [PATCH] Bug 20216: Correctly populate values in itemtype editor

Caused by a bad merge conflict on bug 12768.

To test:
1 - Edit an item type, define a replacement cost,processing fee, and
remote image url
2 - Save the item type
3 - Values are correct in list
4 - Edit again
5 - note values in fields are not populated
6 - Save itemtype, values are lost
7 - Apply patch
8 - Repeat 1-4
9 - Values should be correctly populated and saved now

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Bug 20216: (follow-up) - Fix other use of remote_image

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 183e4f080d..faead47407 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,14 @@ Item types administration
                         <ul>
                             <li>
                                 <label for="remote_image_check"> Remote image:</label>
-                                [% IF remote_image %]
+                                [% IF itemtype.imageurl %]
                                     <input type="radio" id="remote_image_check" name="image" value="remoteImage" checked="checked" />
                                 [% ELSE %]
                                     <input type="radio" id="remote_image_check" name="image" value="remoteImage" />
                                 [% END %]
-                                <input type="text" name="remoteImage" size="48" maxlength="200" value="[% remote_image %]" onmousedown="document.getElementById('remote_image_check').checked = true;" />
-                                [% IF ( remote_image ) %]
-                                    <img src="[% remote_image %]" alt="" />
+                                <input type="text" name="remoteImage" size="48" maxlength="200" value="[% itemtype.imageurl %]" onmousedown="document.getElementById('remote_image_check').checked = true;" />
+                                [% IF itemtype.imageurl %]
+                                    <img src="[% itemtype.imageurl %]" alt="" />
                                 [% END %]
                             </li>
                         </ul>
@@ -235,11 +235,11 @@ Item types administration
                 </li>
                 <li>
                     <label for="defaultreplacecost">Default replacement cost: </label>
-                    <input type="text" id="defaultreplacecost" name="defaultreplacecost" size="10" value="[% defaultreplacecost %]" />
+                    <input type="text" id="defaultreplacecost" name="defaultreplacecost" size="10" value="[% itemtype.defaultreplacecost %]" />
                 </li>
                 <li>
                     <label for="processfee">Processing fee (when lost): </label>
-                    <input type="text" id="processfee" name="processfee" size="10" value="[% processfee %]" />
+                    <input type="text" id="processfee" name="processfee" size="10" value="[% itemtype.processfee %]" />
                 </li>
                 <li>
                     <label for="checkinmsg">Checkin message: </label>