Attachment 5273 Details for Bug 6458 – [SIGNED-OFF] Fix for Bug 6458 - incorrect parsing result in translation processing / addbiblio

[patch] [SIGNED-OFF] Fix for Bug 6458 - incorrect parsing result in translation processing / addbiblio

SIGNED-OFF-Fix-for-Bug-6458---incorrect-parsing-re.patch (text/plain), 4.02 KB, created by Katrin Fischer on 2011-09-02 06:12:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2011-09-02 06:12:42 UTC

Size: 4.02 KB

patch

obsolete

>From e06bc7dc63f1c46a1d25e087f3c7b5a5537e6781 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 1 Sep 2011 11:14:50 -0400
>Subject: [PATCH] [SIGNED-OFF] 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 MARC
>editor. Modifying script to stop tag attribute markup from being
>passed to the template directly in favor of using template logic.
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>I fixed the conflict with previous patch for addbiblio.tt.
>---
> cataloguing/addbiblio.pl                           |    2 +-
> .../prog/en/modules/cataloguing/addbiblio.tt       |   15 +++++++++++----
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
>diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
>index 637d82d..21601e9 100755
>--- a/cataloguing/addbiblio.pl
>+++ b/cataloguing/addbiblio.pl
>@@ -874,7 +874,7 @@ foreach my $thisframeworkcode ( keys %$frameworks ) {
> 		frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
> 	);
> 	if ($frameworkcode eq $thisframeworkcode){
>-		$row{'selected'}="selected=\"selected\"";
>+		$row{'selected'} = 1;
> 		}
> 	push @frameworkcodeloop, \%row;
> } 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 84c85d1..0d974a6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -778,8 +778,12 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
> 			<li id="changeframework"><label for="Frameworks">Change framework: </label>
> 			<select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
> 			                <option value="Default">Default</option>
>-							[% FOREACH frameworkcodeloo IN frameworkcodeloop %]                                             
>-                                <option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
>+							[% FOREACH frameworkcodeloo IN frameworkcodeloop %]
>+                                [% IF ( frameworkcodeloo.selected ) %]
>+                                    <option value="[% frameworkcodeloo.value %]" selected="selected">
>+                                [% ELSE %]
>+                                    <option value="[% frameworkcodeloo.value %]">
>+                                [% END %]
> 					             [% frameworkcodeloo.frameworktext %]                                      
>                                  </option>                          
> 					        [% END %]
>@@ -857,8 +861,11 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
>             <div class="subfield_line" style="[% subfield_loo.visibility %]; float: left; clear: left; width: 100%;" id="subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]">
>             
>                 [% UNLESS ( subfield_loo.advancedMARCEditor ) %]
>-                    [% IF ( subfield_loo.fixedfield ) %]<label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" style="display:none;" class="labelsubfield">
>-                    [% ELSE %]<label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" class="labelsubfield">[% END %]
>+                [% IF ( subfield_loo.fixedfield ) %]
>+                    <label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" style="display:none;"  class="labelsubfield">
>+                [% ELSE %]
>+                    <label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" class="labelsubfield">
>+                [% END %]
>                 [% END %] 
>                 
>                 [% UNLESS ( subfield_loo.hide_marc ) %]
>-- 
>1.7.4.1

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