[Koha-patches] [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard
oleonard at myacpl.org
Fri Aug 26 16:05:51 CEST 2011
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
More information about the Koha-patches
mailing list