From 01afbb392d81de85c1ef54e5e6ec514f9c7ec934 Mon Sep 17 00:00:00 2001 From: Lari Taskula Date: Tue, 28 Nov 2017 19:32:22 +0200 Subject: [PATCH] Bug 18595: Disable digest checkbox when forced on To test: 1. Force a digest on via message_transports table (delete rows where message_attribute is 1 and is_digest is 0) 2. Go to either OPAC or staff client messaging preferences 3. Observe digest checkbox is disabled for message attribute 1 (normally Item due row) --- .../prog/en/includes/messaging-preference-form.inc | 18 +++++++++++++++--- .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 11 ++++++++--- 2 files changed, 23 insertions(+), 6 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 70761a0..ad13432 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 @@ -9,7 +9,9 @@ $(document).ready(function(){ $("#sms"+newid).prop("checked", false); $("#email"+newid).prop("checked", false); $("#phone"+newid).prop("checked", false); - $("#digest"+newid).prop("checked", false); + if (!$("#forcedigest"+newid).length) { + $("#digest"+newid).prop("checked", false); + } $("#rss"+newid).prop("checked", false); } }); @@ -182,12 +184,22 @@ $(document).ready(function(){ + name="digest" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" + [% IF ( !messaging_preference.has_digest_off ) %] disabled="disabled"[% END %] /> [% ELSE %] + name="digest" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" + [% IF ( !messaging_preference.has_digest_off ) %] checked="checked" disabled="disabled"[% END %]/> + [% END %] + [% IF ( !messaging_preference.has_digest_off ) # Because of disabled checkboxes are considered as false, use hidden input field to send true value %] + [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt index 801389c..7ac76eb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -114,9 +114,12 @@ [% IF ( messaging_preference.has_digest ) %] [% IF ( messaging_preference.digest ) %] - + [% ELSE %] - + + [% END %] + [% IF ( !messaging_preference.has_digest_off ) # Because of disabled checkboxes are considered as false, use hidden input field to send true value %] + [% END %] [% ELSE %] @@ -179,7 +182,9 @@ newid = Number(rowid.replace("none","")) $("#sms"+newid).removeAttr("checked"); $("#email"+newid).removeAttr("checked"); - $("#digest"+newid).removeAttr("checked"); + if (!$("#forcedigest"+newid).length) { + $("#digest"+newid).removeAttr("checked"); + } $("#rss"+newid).removeAttr("checked"); } }); -- 2.7.4