begin exposing lassos in the OPAC

git-svn-id: svn://svn.open-ils.org/ILS/trunk@9232 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index 26870be..b8b4499 100644 (file)
--- a/Open-ILS/web/opac/common/js/opac_utils.js
+++ b/Open-ILS/web/opac/common/js/opac_utils.js
@@ -109,11 +109,17 @@ function initParams() {
        /* handle the location var */
        var org;
        var loc = cgi.param(PARAM_LOCATION);
        /* handle the location var */
        var org;
        var loc = cgi.param(PARAM_LOCATION);

-       if( loc ) {
-               org = findOrgUnit(loc);
-               if(!org) org = findOrgUnitSN(loc);
-       } 
-       LOCATION        = (org) ? org.id() : null;
+
+    if (loc) {
+       if(isNaN(loc)) org = findOrgUnitSN(loc);
+
+           if( !org ) {
+            if ( parseInt(loc) < 0 ) org = findOrgLasso( -1 * loc );
+               else org = findOrgUnit(loc);
+       } 
+    }
+
+       LOCATION = org ? org.id() : null;

 
        org = null;
        loc = cgi.param(PARAM_ORIGLOC);
 
        org = null;
        loc = cgi.param(PARAM_ORIGLOC);

diff --git a/Open-ILS/web/opac/common/js/org_utils.js b/Open-ILS/web/opac/common/js/org_utils.js
index 0cba532..2acf826 100644 (file)
--- a/Open-ILS/web/opac/common/js/org_utils.js
+++ b/Open-ILS/web/opac/common/js/org_utils.js
@@ -47,6 +47,14 @@ function findOrgUnit(org_id) {
        return (typeof org_id == 'object') ? org_id : orgArraySearcher[org_id];
 }
 
        return (typeof org_id == 'object') ? org_id : orgArraySearcher[org_id];
 }
 

+function findOrgLasso(lasso_id) {
+       if (typeof lasso_id == 'object') return lasso_id;
+    for (var i in _lasso) {
+        if (_lasso[i].id() == lasso_id) return _lasso[i];
+    }
+    return null;
+}
+

 var orgArraySearcherSN = {};
 function findOrgUnitSN(shortname) {
        if (typeof shortname == 'object') return shortname;
 var orgArraySearcherSN = {};
 function findOrgUnitSN(shortname) {
        if (typeof shortname == 'object') return shortname;