From 850b36696ca163572ed2107117e312c9a71c5332 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 17 Jan 2023 18:42:28 +0000 Subject: [PATCH] Bug 32655: Move phone and itiva variables into templates To test: 1. Go to a patron record or create a new one. 2. Toggle the 'Patron messaging preferences' fieldset so it is hidden. 3. Notice the variables. 4. Apply patch 5. Try steps 1 & 2 again, no varibales. 6. Attempt to toggle on/off options for email/sms. When email/sms are off the digest option next to it should be disabled. 7. Go to Administration > Patron categories and try step 6 there as well. Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 176397d7619abf79969c98b7adc20a1c52da47fd) Signed-off-by: Jacob O'Mara (cherry picked from commit ec70e54af5652e99ede5b1080906c9d49bf9ef18) Signed-off-by: Lucas Gass --- .../prog/en/includes/messaging-preference-form.inc | 4 ---- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 4 ++++ .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 3 +++ 3 files changed, 7 insertions(+), 4 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 8d7fa55f9c..52fc5b7c18 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,10 +1,6 @@ [% USE Koha %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 0bf91ecc59..1137bec69a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -712,6 +712,10 @@ [% MACRO jsinclude BLOCK %] + [% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/messaging-preference-form.js") | $raw %] [% INCLUDE 'calendar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 81d5bc2cbc..1a58a60751 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1872,6 +1872,9 @@ legend:hover { [% END %] $("#guarantor_template").hide(); + var TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %]; + var PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %]; + [% Asset.js("js/members.js") | $raw %] [% Asset.js("js/messaging-preference-form.js") | $raw %] -- 2.39.5