Bugzilla – Attachment 5427 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]
Proposed fix for messaging preference form
0001-Fix-for-Bug-6458-incorrect-parsing-messaging-include.patch (text/plain), 6.75 KB, created by
Owen Leonard
on 2011-09-14 19:23:33 UTC
(
hide
)
Description:
Proposed fix for messaging preference form
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-09-14 19:23:33 UTC
Size:
6.75 KB
patch
obsolete
>From ce1642ddad0ac2437982f2cfec1eaaf1ea6450e3 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 13 Sep 2011 09:51:01 -0400 >Subject: [PATCH] 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 >messaging preferences include. >--- > .../prog/en/includes/messaging-preference-form.inc | 68 ++++++++++++++++---- > 1 files changed, 55 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >index 7ece680..577f19a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc >@@ -54,15 +54,29 @@ > [% IF ( messaging_preference.transport_sms ) %] > [% IF ( SMSSendDriver ) %]<td> > [% IF ( messaging_form_inactive ) %] >+ [% IF ( messaging_preference.transports_sms ) %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="sms" [% messaging_preference.transport_sms %] disabled="disabled" /> >+ value="sms" checked="checked" disabled="disabled" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="sms[% messaging_preference.message_attribute_id %]" >+ name="[% messaging_preference.message_attribute_id %]" >+ value="sms" disabled="disabled" /> >+ [% END %] > [% ELSE %] >+ [% IF ( messaging_preference.transports_sms ) %] >+ <input type="checkbox" >+ id="sms[% messaging_preference.message_attribute_id %]" >+ name="[% messaging_preference.message_attribute_id %]" >+ value="sms" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="sms" [% messaging_preference.transport_sms %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ value="sms" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% END %] > [% END %] > </td>[% END %] > [% ELSE %] >@@ -72,15 +86,29 @@ > [% IF ( messaging_preference.transport_email ) %] > <td> > [% IF ( messaging_form_inactive ) %] >+ [% IF ( messaging_preference.transports_email ) %] >+ <input type="checkbox" >+ id="email[% messaging_preference.message_attribute_id %]" >+ name="[% messaging_preference.message_attribute_id %]" >+ value="email" checked="checked" disabled="disabled" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="email[% messaging_preference.message_attribute_id %]" >+ name="[% messaging_preference.message_attribute_id %]" >+ value="email" disabled="disabled" /> >+ [% END %] >+ [% ELSE %] >+ [% IF ( messaging_preference.transports_email ) %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="email" [% messaging_preference.transport_email %] disabled="disabled" /> >- [% ELSE %] >+ value="email" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="email" [% messaging_preference.transport_email %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ value="email" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% END %] > [% END %] > </td> > [% ELSE %] >@@ -90,15 +118,29 @@ > [% IF ( messaging_preference.has_digest ) %] > <td> > [% IF ( messaging_form_inactive ) %] >- <input type="checkbox" >- id="digest[% messaging_preference.message_attribute_id %]" >- value="[% messaging_preference.message_attribute_id %]" >- name="digest" [% messaging_preference.digest %] disabled="disabled" /> >+ [% IF ( messaging_preference.digest ) %] >+ <input type="checkbox" >+ id="digest[% messaging_preference.message_attribute_id %]" >+ value="[% messaging_preference.message_attribute_id %]" >+ name="digest" checked="checked" disabled="disabled" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="digest[% messaging_preference.message_attribute_id %]" >+ value="[% messaging_preference.message_attribute_id %]" >+ name="digest" disabled="disabled" /> >+ [% END %] > [% ELSE %] >- <input type="checkbox" >- id="digest[% messaging_preference.message_attribute_id %]" >- value="[% messaging_preference.message_attribute_id %]" >- name="digest" [% messaging_preference.digest %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% IF ( messaging_preference.digest ) %] >+ <input type="checkbox" >+ id="digest[% messaging_preference.message_attribute_id %]" >+ value="[% messaging_preference.message_attribute_id %]" >+ name="digest" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="digest[% messaging_preference.message_attribute_id %]" >+ value="[% messaging_preference.message_attribute_id %]" >+ name="digest" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> >+ [% END %] > [% END %] > </td> > [% ELSE %] >-- >1.7.3 >
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