Attachment 5417 Details for Bug 6458 – Proposed fix for tools/csv-profiles.tt

[patch] Proposed fix for tools/csv-profiles.tt

0001-Fix-for-Bug-6458-incorrect-parsing-csv-profiles.patch (text/plain), 2.49 KB, created by Owen Leonard on 2011-09-13 14:09:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2011-09-13 14:09:17 UTC

Size: 2.49 KB

patch

obsolete

>From 88016dd9b758a3afb3c8f1e505f2922e8369c4ea Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 13 Sep 2011 09:33:05 -0400
>Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing
>Content-Type: text/plain; charset="utf-8"
>
>Fixing improperly nested template logic inside HTML tags in
>CSV profiles template
>
>Also fixing improperly scoped template variable which prevented
>the current profile from being preselected under the edit tab.
>---
> .../prog/en/modules/tools/csv-profiles.tt          |    9 ++++++---
> 1 files changed, 6 insertions(+), 3 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 7432bf6..f3c5192 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,11 @@ function reloadPage(p) {
> 						    <li><label for="new_encoding">Encoding: </label>
> 						    <select name="encoding" id="new_encoding">
> 							[% FOREACH encoding IN encodings %]
>-							    <option[% IF ( encoding == 'utf8' ) %] selected="selected" [% END %]>[% encoding.encoding %]</option>
>+								[% IF ( encoding == 'utf8' ) %]
>+									<option selected="selected">[% encoding.encoding %]</option>
>+								[% ELSE %]
>+									<option>[% encoding.encoding %]</option>
>+								[% END %]
> 							[% END %]
> 						    </select></li>
> 
>@@ -129,7 +133,7 @@ function reloadPage(p) {
> 						    <select id="modify_profile_name" name="profile_name" onchange="javascript:reloadPage(this)">
> 							<option value="0">-- Choose One --</option>
> 							[% FOREACH existing_profile IN existing_profiles %]
>-							[% IF ( export_format_id == selected_profile_id ) %]
>+							[% IF ( existing_profile.export_format_id == selected_profile_id ) %]
> 							<option value="[% existing_profile.export_format_id %]" selected="selected">[% existing_profile.profile %]</option>
> 							[% ELSE %]
> 							<option value="[% existing_profile.export_format_id %]">[% existing_profile.profile %]</option>
>@@ -231,7 +235,6 @@ function reloadPage(p) {
> 						    <select name="subfield_separator" id="subfield_separator">
>                                 <option value=":">Colon (:)</option>
> 
>-
>                                 [% IF ( selected_subfield_separator == ',' ) %]
>                                 <option value="," selected="selected">Comma (,)</option>
>                                 [% ELSE %]
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6458: 4695 | 4697 | 4699 | 4729 | 4968 | 5070 | 5071 | 5072 | 5074 | 5078 | 5079 | 5080 | 5081 | 5082 | 5090 | 5091 | 5092 | 5093 | 5094 | 5095 | 5096 | 5121 | 5125 | 5126 | 5127 | 5128 | 5129 | 5130 | 5131 | 5132 | 5133 | 5147 | 5148 | 5149 | 5150 | 5152 | 5153 | 5155 | 5156 | 5157 | 5158 | 5159 | 5160 | 5168 | 5169 | 5170 | 5258 | 5259 | 5260 | 5261 | 5262 | 5263 | 5273 | 5274 | 5286 | 5287 | 5288 | 5289 | 5292 | 5293 | 5299 | 5300 | 5416 | 5417 | 5418 | 5419 | 5420 | 5425 | 5426 | 5427