[open-ils-commits] [GIT] Evergreen ILS branch master updated. bf83c01e4f232e050ec320969b9bb6c6a8c1eeb1

[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, master has been updated
       via  bf83c01e4f232e050ec320969b9bb6c6a8c1eeb1 (commit)
      from  489390cb9b0ac1fb110b2e97bfdaa380daa3d61e (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 bf83c01e4f232e050ec320969b9bb6c6a8c1eeb1
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Wed May 18 02:14:52 2011 -0400

    fix CN prefix/suffix display in XUL interfaces so we can handle any affix we come across
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
index f73f071..17a1ac9 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
@@ -181,6 +181,16 @@ OpenILS.data.prototype = {
             var obj = this; var found;
             if (obj.hash[key] && obj.hash[key][value]) return obj.hash[key][value];
             switch(key) {
+                case 'acnp':
+                    found = obj.network.simple_request('FM_ACNP_RETRIEVE_VIA_PCRUD',[ ses(), { 'id' : { '=' : value } }]);
+                    if (typeof found.ilsevent != 'undefined') throw(js2JSON(found));
+                    found = found[0];
+                break;
+                case 'acns':
+                    found = obj.network.simple_request('FM_ACNS_RETRIEVE_VIA_PCRUD',[ ses(), { 'id' : { '=' : value } }]);
+                    if (typeof found.ilsevent != 'undefined') throw(js2JSON(found));
+                    found = found[0];
+                break;
                 case 'acpl': 
                     found = obj.network.simple_request('FM_ACPL_RETRIEVE_VIA_ID.authoritative',[ value ]);
                 break;
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 14bffab..9859415 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -641,7 +641,7 @@ circ.util.columns = function(modify,params) {
                 if (typeof my.acn == 'undefined') return '';
                 return (typeof my.acn.prefix() == 'object')
                     ? my.acn.prefix().label()
-                    : data.hash.acnp[ my.acn.prefix() ].label();
+                    : data.lookup("acnp", my.acn.prefix() ).label();
             },
             'persist' : 'hidden width ordinal'
         },
@@ -656,7 +656,7 @@ circ.util.columns = function(modify,params) {
                 if (typeof my.acn == 'undefined') return '';
                 return (typeof my.acn.suffix() == 'object')
                     ? my.acn.suffix().label()
-                    : data.hash.acns[ my.acn.suffix() ].label();
+                    : data.lookup("acns", my.acn.suffix() ).label();
             },
             'persist' : 'hidden width ordinal'
         },

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

Summary of changes:
 .../staff_client/chrome/content/OpenILS/data.js    |   10 ++++++++++
 Open-ILS/xul/staff_client/server/circ/util.js      |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS