Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 607dce7..c628820 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -269,7 +269,10 @@ sub language {
 sub charge_ok {
     my $self = shift;
     my $u = $self->{user};
-    return (($u->barred eq 'f') and ($u->card->active eq 't'));
+    return 
+        $u->barred eq 'f' and 
+        $u->active eq 't' and
+        $u->card->active eq 't';
 }
 
 # How much more detail do we need to check here?

diff --git a/Open-ILS/web/opac/skin/default/js/cn_browse.js b/Open-ILS/web/opac/skin/default/js/cn_browse.js
index 232e37d..94b8c8b 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/cn_browse.js
+++ b/Open-ILS/web/opac/skin/default/js/cn_browse.js
@@ -105,7 +105,18 @@ function _cnBrowseDraw( list ) {
                var author_td           = $n(currentTd, 'cn_browse_author');
                var pic_td                      = $n(currentTd, 'cn_browse_pic');
 
+               if (parseInt(cn.prefix().id()) > -1) {
+            cn_td.appendChild(text(cn.prefix().label()));
+            cn_td.appendChild(text(' '));
+        }
+
                cn_td.appendChild(text(cn.label()));
+
+               if (parseInt(cn.suffix().id()) > -1) {
+            cn_td.appendChild(text(' '));
+            cn_td.appendChild(text(cn.suffix().label()));
+        }
+
                lib_td.appendChild(text(findOrgUnit(cn.owning_lib()).name()));
                cnBrowseDrawTitle(mods, title_td, author_td, pic_td);