From 3c7267dcc6de0086190708345ebed35b452ad139 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) 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) Rebased-by: Emmi Takkinen --- .../prog/en/includes/messaging-preference-form.inc | 14 ++++++++++++-- .../prog/js/messaging-preference-form.js | 8 ++++++-- .../bootstrap/en/modules/opac-messaging.tt | 8 ++++++-- 3 files changed, 24 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 b27cc00af5..3f9143ffc9 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 @@ -206,12 +206,22 @@ + name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" + [% IF ( !messaging_preference.has_digest_off ) %] disabled="disabled" title="Digest is mandatory"[% ELSE %] title="You must select a digestible transport to select digests"[% END %] /> [% ELSE %] + name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" + [% IF ( !messaging_preference.has_digest_off ) %] checked="checked" disabled="disabled" title="Digest is mandatory"[% ELSE %] title="You must select a digestible transport to select digests"[% 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/intranet-tmpl/prog/js/messaging-preference-form.js b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js index 5fdc5c1917..65e4379adf 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js +++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js @@ -57,9 +57,13 @@ $(document).ready(function(){ function toggle_digest(id){ let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false; if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) { - $("#digest"+id).attr("disabled", false).tooltip('disable'); + if ($("#forcedigest"+id).length === 0) { + $("#digest"+id).attr("disabled", false).tooltip('disable'); + } } else { - $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); + if ($("#forcedigest"+id).length === 0) { + $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); + } } } 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 598ba1f20a..b3c956bc21 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -163,9 +163,13 @@ [% 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 %] -- 2.25.1