Bugzilla – Attachment 119331 Details for
Bug 13613
Don't allow digest to be selected without a digest-able transport selected
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13613: Don't allow digest to be selected without a digest-able transport selected
Bug-13613-Dont-allow-digest-to-be-selected-without.patch (text/plain), 16.96 KB, created by
Owen Leonard
on 2021-04-08 15:22:55 UTC
(
hide
)
Description:
Bug 13613: Don't allow digest to be selected without a digest-able transport selected
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2021-04-08 15:22:55 UTC
Size:
16.96 KB
patch
obsolete
>From fdbc3dad481d38057f17ecd4d6e0da76c4039bb0 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 22 Jan 2015 12:36:31 -0500 >Subject: [PATCH] Bug 13613: Don't allow digest to be selected without a > digest-able transport selected > >By default, only the email transport is enabled. This gives the >messaging preferences the look of having email and digest and two >options. I.E. to some users it appears that you check email for single >emails, *or* you check digest for a digest email. > >To help remove this possible confusion, the digest mode checkbox should >be disabled if no digest-able transports are checked for a given notice. > >Test Plan: >1) Apply this patch >2) For both the staff interface and the opac, note that the digest > checkbox is disabled any time that no digest enabled transport ( > email, sms if enabled ) is checked for the patron editor. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/includes/messaging-preference-form.inc | 24 ++++++------ > .../prog/js/messaging-preference-form.js | 31 ++++++++++++++++ > .../bootstrap/en/modules/opac-messaging.tt | 43 ++++++++++++++++++++-- > 3 files changed, 82 insertions(+), 16 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 f2a2e0f241..be4119c7a5 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 >@@ -56,24 +56,24 @@ > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" checked="checked" disabled="disabled" /> >+ value="sms" class="sms" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" disabled="disabled" /> >+ value="sms" class="sms" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.transports_sms ) %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="sms" checked="checked" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="sms" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >@@ -155,24 +155,24 @@ > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" checked="checked" disabled="disabled" /> >+ value="email" class="email" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" disabled="disabled" /> >+ value="email" class="email" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.transports_email ) %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="email" checked="checked" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="email" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >@@ -187,24 +187,24 @@ > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" checked="checked" disabled="disabled" /> >+ name="digest" class="digest" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" disabled="disabled" /> >+ name="digest" class="digest" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.digest ) %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ name="digest" checked="checked" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ name="digest" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >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 ea01a62d80..920a9f7926 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >@@ -47,4 +47,35 @@ $(document).ready(function(){ > }); > }); > } >+ >+ // At load time, we want digest disabled if no digest using transport is enabled >+ $("#memberentry_messaging_prefs .email").each(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true).prop("checked",false); >+ } >+ }); >+ >+ // If user clears all digest using transports for a notice, disable digest checkbox >+ $(".email").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ $(".sms").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("sms","")); >+ if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true).prop("checked",false); >+ } >+ }); > }); >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 a8a7b95938..1fb470da3f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -89,9 +89,9 @@ > [% IF ( messaging_preference.transport_sms ) %] > <td class="selectcol"> > [% IF ( messaging_preference.transports_sms ) %] >- <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" /> >+ <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" /> > [% ELSE %] >- <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" /> >+ <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" /> > [% END %] > </td> > [% ELSE %] >@@ -103,11 +103,13 @@ > <td class="selectcol"> > [% IF ( messaging_preference.transports_phone ) %] > <input type="checkbox" >+ class="phone" > id="phone[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" > value="phone" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> > [% ELSE %] > <input type="checkbox" >+ class="phone" > id="phone[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" > value="phone" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> >@@ -122,11 +124,13 @@ > <td class="selectcol"> > [% IF ( messaging_preference.transports_itiva ) %] > <input type="checkbox" >+ class="itiva" > id="itiva[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" > value="itiva" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> > [% ELSE %] > <input type="checkbox" >+ class="itiva" > id="itiva[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" > value="itiva" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> >@@ -140,9 +144,9 @@ > [% IF ( messaging_preference.transport_email ) %] > <td class="selectcol"> > [% IF ( messaging_preference.transports_email ) %] >- <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> >+ <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> > [% ELSE %] >- <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> >+ <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" /> > [% END %] > </td> > [% ELSE %] >@@ -255,6 +259,37 @@ > } > }); > $("#info_digests").tooltip(); >+ >+ // At load time, we want digest disabled if no digest using transport is enabled >+ $(".email").each(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ >+ // If user clears all digest using transports for a notice, disable digest checkbox >+ $(".email").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true).prop("checked",false); >+ } >+ }); >+ $(".sms").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("sms","")); >+ if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true).prop("checked",false); >+ } >+ }); > }); > > function normalizeSMS(value){ >-- >2.11.0
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 13613
:
35471
|
118379
|
118380
|
118381
|
118648
|
118742
|
119331
|
119332
|
119333
|
120081
|
120737
|
120738
|
120739
|
120740
|
120760
|
120838