[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 69dc5150c697e525f3c2ff41b3f578e5912e2b16

[Evergreen Git]

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_2 has been updated
       via  69dc5150c697e525f3c2ff41b3f578e5912e2b16 (commit)
      from  dfb7054c3a943e98f2c95d4e598e48c6e20f402e (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 69dc5150c697e525f3c2ff41b3f578e5912e2b16
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Fri Apr 13 13:26:59 2012 -0400

    Default email/phone hold pickup in TPac
    
    Like JSPac does, but currently without the check of having phone/email.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 76a88d8..eaa9622 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -625,7 +625,7 @@ sub load_place_hold {
     };
     $ctx->{user_setting_map} = $user_setting_map;
 
-    my $default_notify = $$user_setting_map{'opac.hold_notify'} || '';
+    my $default_notify = (defined $$user_setting_map{'opac.hold_notify'} ? $$user_setting_map{'opac.hold_notify'} : 'email:phone');
     if ($default_notify =~ /email/) {
         $ctx->{default_email_notify} = 'checked';
     } else {
diff --git a/Open-ILS/web/js/ui/default/opac/staff.js b/Open-ILS/web/js/ui/default/opac/staff.js
index 4d805a5..989f07c 100644
--- a/Open-ILS/web/js/ui/default/opac/staff.js
+++ b/Open-ILS/web/js/ui/default/opac/staff.js
@@ -45,7 +45,7 @@ function staff_hold_usr_barcode_changed(isload) {
         if(!load_info.settings['opac.default_phone']) load_info.settings['opac.default_phone'] = '';
         if(!load_info.settings['opac.default_sms_notify']) load_info.settings['opac.default_sms_notify'] = '';
         if(!load_info.settings['opac.default_sms_carrier']) load_info.settings['opac.default_sms_carrier'] = '';
-        if(load_info.settings['opac.hold_notify']) {
+        if(load_info.settings['opac.hold_notify'] || load_info.settings['opac.hold_notify'] === '') {
             var email = load_info.settings['opac.hold_notify'].indexOf('email') > -1;
             var phone = load_info.settings['opac.hold_notify'].indexOf('phone') > -1;
             var sms = load_info.settings['opac.hold_notify'].indexOf('sms') > -1;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index c004f05..86e08e1 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -2566,6 +2566,7 @@ commands:
             settings[user.settings()[i].name()] = JSON2js(user.settings()[i].value());
         }
         if(!settings['opac.default_phone'] && user.day_phone()) settings['opac.default_phone'] = user.day_phone();
+        if(!settings['opac.hold_notify'] && settings['opac.hold_notify'] !== '') settings['opac.hold_notify'] = 'email:phone';
         return {"barcode": barcode, "settings" : settings};
     },
 

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/WWW/EGCatLoader/Account.pm         |    2 +-
 Open-ILS/web/js/ui/default/opac/staff.js           |    2 +-
 .../xul/staff_client/chrome/content/main/menu.js   |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS