[open-ils-commits] [GIT] Evergreen ILS branch rel_2_8 updated. f6fcd65882f2522e58f525b7d2afa81faa4fbe23
Evergreen Git
git at git.evergreen-ils.org
Mon Mar 14 15:11:19 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_8 has been updated
via f6fcd65882f2522e58f525b7d2afa81faa4fbe23 (commit)
via cc88418f031c6ef3b1fe1761555744de23fa036d (commit)
from 7b4ae8d57b8595bd20fb2afcff2d0e416a69fb35 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f6fcd65882f2522e58f525b7d2afa81faa4fbe23
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Mar 14 15:10:14 2016 -0400
LP#1454871: whitespace cleanup
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2
index dd1d5c5..921a4b3 100644
--- a/Open-ILS/src/templates/kpac/getit.tt2
+++ b/Open-ILS/src/templates/kpac/getit.tt2
@@ -88,18 +88,18 @@
[%- IF ctx.user.email -%]
[% ctx.notify_method.search('email') ?
'<input type="hidden" id="email_notify" name="email_notify" value="t"/>' : '' %]
- [%- END -%]
+ [%- END -%]
- [%- IF allow_phone_notifications == 'true' -%]
- [% IF ctx.default_phone %]
+ [%- IF allow_phone_notifications == 'true' -%]
+ [% IF ctx.default_phone %]
[% phone_value = ctx.default_phone %]
[% ELSE %]
[% phone_value= ctx.user.day_phone %]
[% END %]
-
- [% ctx.notify_method.search('phone') ?
+
+ [% ctx.notify_method.search('phone') ?
'<input type="hidden" id="phone_notify_checkbox" name="phone_notify_checkbox" value="t"/>
- <input type="hidden" name="phone_notify" value="' _ phone_value _ '"/>' : '' %]
+ <input type="hidden" name="phone_notify" value="' _ phone_value _ '"/>' : '' %]
[%- END -%]
[% IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1 %]
@@ -109,7 +109,7 @@
'<input type="hidden" id="sms_notify_checkbox" name="sms_notify_checkbox" value="t" />
<input type="hidden" id="sms_carrier" name="sms_carrier" value="' _ ctx.user_setting_map.$setting_carrier _ '" />
<input type="hidden" id="sms_notify" name="sms_notify" value="' _ ctx.user_setting_map.$setting_notify _ '" />' : '' %]
- [% END %]
+ [% END %]
</div>
[% END %]
commit cc88418f031c6ef3b1fe1761555744de23fa036d
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date: Thu Jun 11 18:15:13 2015 -0400
LP#1454871: Fix KPAC Hold Notification Preferences
Correction to KPAC holds notification default preferences to allow for
SMS text messaging options.
Prior to this correction, KPAC hold notifications would only pick up
hold preferences if set to email and/or phone. This correction allows
it to pick up email and/or phone and/or sms notification preferences.
To test, set hold preferences to different options, place hold via the
KPAC, and then view the hold to see which preferences were recognized.
(May need to show columns for Phone Notify, Text Notify, and Email Notify.)
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2
index 95d2931..dd1d5c5 100644
--- a/Open-ILS/src/templates/kpac/getit.tt2
+++ b/Open-ILS/src/templates/kpac/getit.tt2
@@ -86,18 +86,30 @@
[%- END -%]
[%- IF ctx.user.email -%]
- [%- IF ctx.notify_method == 'email' OR ctx.notify_method == 'email|phone' -%]
- <input type="hidden" id="email_notify" name="email_notify" value="t"/>
- [%- END -%]
- [%- END -%]
-
- [%- IF allow_phone_notifications == 'true' -%]
- [%- IF ctx.notify_method == 'phone' OR ctx.notify_method == 'email|phone' -%]
- <input type="hidden" id="phone_notify_checkbox" name="phone_notify_checkbox" value="t"/>
- <input type="hidden" name="phone_notify"
- value='[% IF ctx.default_phone %][%- ctx.default_phone -%][% ELSE %][%- ctx.user.day_phone -%][% END %]'/>
- [%- END -%]
- [%- END -%]
+ [% ctx.notify_method.search('email') ?
+ '<input type="hidden" id="email_notify" name="email_notify" value="t"/>' : '' %]
+ [%- END -%]
+
+ [%- IF allow_phone_notifications == 'true' -%]
+ [% IF ctx.default_phone %]
+ [% phone_value = ctx.default_phone %]
+ [% ELSE %]
+ [% phone_value= ctx.user.day_phone %]
+ [% END %]
+
+ [% ctx.notify_method.search('phone') ?
+ '<input type="hidden" id="phone_notify_checkbox" name="phone_notify_checkbox" value="t"/>
+ <input type="hidden" name="phone_notify" value="' _ phone_value _ '"/>' : '' %]
+ [%- END -%]
+
+ [% IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1 %]
+ [% setting_notify = 'opac.default_sms_notify';
+ setting_carrier = 'opac.default_sms_carrier'; %]
+ [% ctx.notify_method.search('sms') ?
+ '<input type="hidden" id="sms_notify_checkbox" name="sms_notify_checkbox" value="t" />
+ <input type="hidden" id="sms_carrier" name="sms_carrier" value="' _ ctx.user_setting_map.$setting_carrier _ '" />
+ <input type="hidden" id="sms_notify" name="sms_notify" value="' _ ctx.user_setting_map.$setting_notify _ '" />' : '' %]
+ [% END %]
</div>
[% END %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/kpac/getit.tt2 | 36 ++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 12 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list