From e312c089f641de436a526ff340ec9cae5c21ebb9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 26 Aug 2011 16:07:46 -0400 Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing Content-Type: text/plain; charset="utf-8" Correction for branch admin template stops tag attribute markup from being passed to the template directly in favor of using template logic. --- admin/branches.pl | 6 +++--- .../prog/en/modules/admin/branches.tt | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/admin/branches.pl b/admin/branches.pl index d6388f5..12c49e2 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -254,15 +254,15 @@ sub editbranchform { # # We export a "categoryloop" array to the template, each element of which # contains separate 'categoryname', 'categorycode', 'codedescription', and - # 'checked' fields. The $checked field is either '' or 'checked="checked"' + # 'checked' fields. The $checked field is either empty or 1' my $catinfo = GetBranchCategory(); my @categoryloop = (); foreach my $cat (@$catinfo) { - my $checked = ""; + my $checked; my $tmp = quotemeta( $cat->{'categorycode'} ); if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) { - $checked = "checked=\"checked\""; + $checked = 1; } push @categoryloop, { categoryname => $cat->{'categoryname'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index b92ad52..d0f45c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -99,7 +99,12 @@
    [% FOREACH categoryloo IN categoryloop %]
  1. - [% categoryloo.codedescription %] + [% IF ( categoryloo.checked ) %] + + [% ELSE %] + + [% END %] + [% categoryloo.codedescription %]
  2. [% END %]
-- 1.7.3