From 42d9519db669d9a68114c936d5e9c26e3742547f Mon Sep 17 00:00:00 2001 From: Lari Taskula Date: Tue, 28 Nov 2017 19:32:22 +0200 Subject: [PATCH 8/9] 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) SQL: delete from message_transports where message_attribute_id=1 and is_digest=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) Signed-off-by: David Bourgault Rebased-by: Emmi Takkinen --- .../prog/en/includes/messaging-preference-form.inc | 14 ++++++++++++-- .../bootstrap/en/modules/opac-messaging.tt | 11 ++++++++--- 2 files changed, 20 insertions(+), 5 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 d2faaabb7d..fd3c778356 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 @@ -163,12 +163,22 @@ + name="digest" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" + [% IF ( !messaging_preference.has_digest_off ) %] disabled="disabled"[% END %] /> [% ELSE %] + name="digest" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" + [% 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 0b44d80ade..ac959c14a3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -128,9 +128,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 %] @@ -226,7 +229,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.17.1