[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 61cca819d8ee767a907bc1dbd54c3921beb226ee

Evergreen Git git at git.evergreen-ils.org
Wed May 2 14:12:40 EDT 2012


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  61cca819d8ee767a907bc1dbd54c3921beb226ee (commit)
      from  28e63defd7f546638f28cb009f3b7f39d35a6069 (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 61cca819d8ee767a907bc1dbd54c3921beb226ee
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Tue Apr 3 14:45:10 2012 -0400

    Fix some "null" instead of blank values in JSPac
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Michael Peters <mrpeters at library.in.gov>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index bb643af..60487c2 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -613,7 +613,7 @@ function __holdsDrawWindow() {
 	}
 
 
-	$('holds_phone').value = holdArgs.recipient.day_phone();
+	$('holds_phone').value = (holdArgs.recipient.day_phone() ? holdArgs.recipient.day_phone() : '');
 	var pref = holdArgs.recipient.prefs[PREF_DEF_PHONE];
 	if(pref) $('holds_phone').value = pref;
 	appendClear( $('holds_email'), text(holdArgs.recipient.email()));
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 7f006d2..7378106 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -869,9 +869,11 @@ function _myOPACSummaryShowUer(r) {
         unHideMe($('myopac.expired.alert'));
     }
 
-	var iv1 = user.ident_value()+'';
-    if (iv1.length > 4 && iv1.match(/\d{4}/)) iv1 = iv1.substring(0,4) + '***********';
-
+	var iv1 = '';
+    if (user.ident_value()) {
+        iv1 = user.ident_value()+'';
+        if (iv1.length > 4 && iv1.match(/\d{4}/)) iv1 = iv1.substring(0,4) + '***********';
+    }
 
 	appendClear($('myopac_summary_prefix'),text(user.prefix()));
 	appendClear($('myopac_summary_first'),text(user.first_given_name()));

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

Summary of changes:
 Open-ILS/web/opac/skin/default/js/holds.js  |    2 +-
 Open-ILS/web/opac/skin/default/js/myopac.js |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list