From e4301a52b83ca24876ff58fd78bee863df5ce398 Mon Sep 17 00:00:00 2001 From: Nick Clemens 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 Bug 20216: (follow-up) - Fix other use of remote_image Signed-off-by: Jonathan Druart --- .../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
  • - [% IF remote_image %] + [% IF itemtype.imageurl %] [% ELSE %] [% END %] - - [% IF ( remote_image ) %] - + + [% IF itemtype.imageurl %] + [% END %]
@@ -235,11 +235,11 @@ Item types administration
  • - +
  • - +
  • -- 2.39.5