From 03c59ec86db4154ffbd73fa9e3ba0aa1d064b51d Mon Sep 17 00:00:00 2001
From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Date: Fri, 29 Mar 2013 14:53:45 +0100
Subject: [PATCH] Bug 9954 - CVS profile encoding not selected in edition

When editing an existing CSV profile, its encoding is not selected in combobox, first value "ascii" is always selected.

This patch corrects this (surely appeared with TT conversion) and also the fact that "uft8" is by default selected in creation form.

Test plan:
- Go to Tools/CSV Profiles
- In "New prodile" tab
=> Check that "uft8" is selected
- Create a new profile by entering name, an encoding (other than the first), and MARC fields
- Click on "Edit existing profile" tab
- Select created profile
=> Check that specified encoding is selected

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change.
Fixed tabs.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
index 2d98836aba..01f516658c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
@@ -101,7 +101,7 @@ function reloadPage(p) {
 						    <li><label for="new_encoding">Encoding: </label>
 						    <select name="encoding" id="new_encoding">
 							[% FOREACH encoding IN encodings %]
-								[% IF ( encoding == 'utf8' ) %]
+                                [% IF ( encoding.encoding == 'utf8' ) %]
 									<option selected="selected">[% encoding.encoding %]</option>
 								[% ELSE %]
 									<option>[% encoding.encoding %]</option>
@@ -281,7 +281,7 @@ function reloadPage(p) {
 						    <li><label for="encoding">Encoding: </label>
 						    <select name="encoding" id="encoding">
 							[% FOREACH encoding IN encodings %]
-							    [% IF ( selected_encoding == encoding ) %]
+                                [% IF ( selected_encoding == encoding.encoding ) %]
 							    <option selected="selected">[% encoding.encoding %]</option>
 							    [% ELSE %]
 							    <option>[% encoding.encoding %]</option>
-- 
2.39.5