Fix for Bug 6458 - incorrect parsing result in translation processing

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: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 637d82d..21601e9 100755 (executable)
--- 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 09bf2d6..baa84c7 100644 (file)
--- 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 %]