[Koha-patches] [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard
oleonard at myacpl.org
Fri Aug 26 22:10:05 CEST 2011
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 @@
<ol>
[% FOREACH categoryloo IN categoryloop %]
<li><label for="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]</label>
- <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" [% categoryloo.checked %] /> <span class="hint">[% categoryloo.codedescription %]</span>
+ [% IF ( categoryloo.checked ) %]
+ <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" checked="checked" />
+ [% ELSE %]
+ <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" />
+ [% END %]
+ <span class="hint">[% categoryloo.codedescription %]</span>
</li>
[% END %]
</ol>
--
1.7.3
More information about the Koha-patches
mailing list