Bugzilla – Attachment 144556 Details for
Bug 31166
Digest option is not selectable for phone when PhoneNotification is enabled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31166: Digest option is not selectable for phone when PhoneNotification is enabled
Bug-31166-Digest-option-is-not-selectable-for-phon.patch (text/plain), 8.53 KB, created by
Tomás Cohen Arazi
on 2022-12-13 18:02:31 UTC
(
hide
)
Description:
Bug 31166: Digest option is not selectable for phone when PhoneNotification is enabled
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi
Created:
2022-12-13 18:02:31 UTC
Size:
8.53 KB
patch
obsolete
>From 0622e118dbdd1687127c0734386e07ca268fd90d Mon Sep 17 00:00:00 2001 >From: Kyle Hall <kyle@bywatersolutions.com> >Date: Fri, 15 Jul 2022 14:10:37 -0400 >Subject: [PATCH] Bug 31166: Digest option is not selectable for phone when > PhoneNotification is enabled > >Digests are not available via Talking Tech, but the artificial limit should not be in place for the non-TT phone notices. If only phone is selected, digest remains disabled. > >Test Plan: >1) Apply this patch >2) Enable TalkingTechPhoneNotification >3) Verify behavior hasn't changed >4) Disable TalkingTechPhoneNotification, Enable PhoneNotification >5) Note disgest option is now selectable if only phone is selected > >Signed-off-by: Evelyn Hartline <evelyn@bywatersolutions.com> >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> > >Bug 31166: (QA follow-up) Remove debugging lines > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> > >Bug 31166: (QA follow-up) Implement on OPAC side > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >Squashed by RM >--- > .../prog/en/includes/messaging-preference-form.inc | 12 ++++++++---- > .../prog/js/messaging-preference-form.js | 6 +++++- > .../bootstrap/en/modules/opac-messaging.tt | 13 ++++++++++--- > 3 files changed, 23 insertions(+), 8 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 accdad7c195..0638545742c 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 >@@ -1,6 +1,10 @@ > [% USE Koha %] > <!-- snippet for form to set borrower and patron category messaging preferences --> > >+<script> >+ var TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %]; >+ var PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %]; >+</script> > <input type="hidden" name="modify" value="yes" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" /> > <table> >@@ -109,12 +113,12 @@ > <input type="checkbox" > id="itiva[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="itiva" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="itiva" checked="checked" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="itiva[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="itiva" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="itiva" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >@@ -141,12 +145,12 @@ > <input type="checkbox" > id="phone[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="phone" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="phone" checked="checked" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="phone[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="phone" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="phone" class="pmp_phone 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 9fc1eb079fc..5fdc5c1917f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >@@ -55,7 +55,8 @@ $(document).ready(function(){ > } > > function toggle_digest(id){ >- if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ 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'); > } else { > $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); >@@ -74,6 +75,9 @@ $(document).ready(function(){ > $(".pmp_sms").click(function(){ > toggle_digest(Number($(this).attr("id").replace("sms", ""))); > }); >+ $(".pmp_phone").click(function(){ >+ toggle_digest(Number($(this).attr("id").replace("phone", ""))); >+ }); > > // $('#memberentry_messaging_prefs [data-toggle="tooltip"][disabled]').tooltip(); > }); >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 97e57a0ce39..598ba1f20a1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -110,13 +110,13 @@ > <td class="selectcol"> > [% IF ( messaging_preference.transports_phone ) %] > <input type="checkbox" >- class="phone" >+ class="pmp_phone" > id="phone[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" > value="phone" checked="checked" /> > [% ELSE %] > <input type="checkbox" >- class="phone" >+ class="pmp_phone" > id="phone[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" > value="phone" /> >@@ -259,7 +259,11 @@ > $("#info_digests").tooltip(); > > function toggle_digest(id){ >- if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >+ let PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %]; >+ let TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %]; >+ 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'); > } else { > $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); >@@ -278,6 +282,9 @@ > $(".pmp_sms").click(function(){ > toggle_digest(Number($(this).attr("id").replace("sms", ""))); > }); >+ $(".pmp_phone").click(function(){ >+ toggle_digest(Number($(this).attr("id").replace("phone", ""))); >+ }); > > }); > >-- >2.34.1
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 31166
:
137788
|
137789
|
139061
|
139062
|
139063
|
139064
|
139065
| 144556