Bugzilla – Attachment 5158 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 opac-messaing.tt
0001-Fix-for-Bug-6458-incorrect-parsing-opac-messaging.patch (text/plain), 5.25 KB, created by
Owen Leonard
on 2011-08-26 14:06:39 UTC
(
hide
)
Description:
Proposed fix for opac-messaing.tt
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-08-26 14:06:39 UTC
Size:
5.25 KB
patch
obsolete
>From aabd7148eeeb26a905ee2d618aa750e88c55c437 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 25 Aug 2011 15:11:09 -0400 >Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing >Content-Type: text/plain; charset="utf-8" > >Correction for opac-messaging.tt tops tag attribute markup from >being passed to the template directly in favor of using template >logic. >--- > C4/Form/MessagingPreferences.pm | 4 +- > .../opac-tmpl/prog/en/modules/opac-messaging.tt | 49 +++++++++++++++---- > 2 files changed, 40 insertions(+), 13 deletions(-) > >diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm >index 4bc742d..85ae9e8 100644 >--- a/C4/Form/MessagingPreferences.pm >+++ b/C4/Form/MessagingPreferences.pm >@@ -140,9 +140,9 @@ sub set_form_values { > } ( 0..30 ); # FIXME: 30 is a magic number. > } > foreach my $transport ( @{$pref->{'transports'}} ) { >- $option->{'transport_'.$transport} = 'checked="checked"'; >+ $option->{'transports_'.$transport} = 1; > } >- $option->{'digest'} = 'checked="checked"' if $pref->{'wants_digest'}; >+ $option->{'digest'} = 1 if $pref->{'wants_digest'}; > } > $template->param(messaging_preferences => $messaging_options); > } >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt >index ebb1e26..4c51f48 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt >@@ -59,29 +59,56 @@ > <td>-</td> > [% END %] > [% IF ( messaging_preference.transport_sms ) %] >- [% IF ( SMSSendDriver ) %]<td><input type="checkbox" >- id="sms[% messaging_preference.message_attribute_id %]" >- name="[% messaging_preference.message_attribute_id %]" >- value="sms" [% messaging_preference.transport_sms %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /></td>[% END %] >+ [% IF ( SMSSendDriver ) %] >+ <td> >+ [% 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 = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="sms[% messaging_preference.message_attribute_id %]" >+ name="[% messaging_preference.message_attribute_id %]" >+ value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ [% END %] >+ </td> >+ [% END %] > [% ELSE %] >- <td>-</td> >+ <td>-</td> > [% END %] > > [% IF ( messaging_preference.transport_email ) %] >- <td><input type="checkbox" >- id="email[% messaging_preference.message_attribute_id %]" >- name="[% messaging_preference.message_attribute_id %]" >- value="email" [% messaging_preference.transport_email %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ <td> >+ [% 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" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="email[% messaging_preference.message_attribute_id %]" >+ name="[% messaging_preference.message_attribute_id %]" >+ value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ [% END %] > </td> > [% ELSE %] > <td>-</td> > [% END %] > > [% IF ( messaging_preference.has_digest ) %] >- <td><input type="checkbox" >+ <td> >+ [% IF ( messaging_preference.digest ) %] >+ <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id %]" > value="[% messaging_preference.message_attribute_id %]" >- name="digest" [% messaging_preference.digest %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ name="digest" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ [% ELSE %] >+ <input type="checkbox" >+ id="digest[% messaging_preference.message_attribute_id %]" >+ value="[% messaging_preference.message_attribute_id %]" >+ name="digest" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ [% END %] > </td> > [% ELSE %] > <td>-</td> >-- >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