Bugzilla – Attachment 5300 Details for
Bug 6458
incorrect parsing result in translation processing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Fix for Bug 6458 - incorrect parsing result in translation processing / branches
SIGNED-OFF-Fix-for-Bug-6458---incorrect-parsing-re.patch (text/plain), 2.73 KB, created by
Katrin Fischer
on 2011-09-02 19:18:23 UTC
(
hide
)
Description:
[SIGNED-OFF] Fix for Bug 6458 - incorrect parsing result in translation processing / branches
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-09-02 19:18:23 UTC
Size:
2.73 KB
patch
obsolete
>From 02de8179c67f57bd24470a47a38fee1a3ab37c9b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 26 Aug 2011 16:07:46 -0400 >Subject: [PATCH] [SIGNED-OFF] Fix for Bug 6458 - incorrect parsing result in translation processing / branches >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. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > 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 42ddb52..1107624 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.4.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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