changed API for highest_org to return -1 instead of null

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index b7d7e46..12a3789 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -1355,7 +1355,7 @@ sub _find_highest_perm_org {
        my ( $perm, $userid, $start_org, $org_tree ) = @_;
        my $org = $apputils->find_org($org_tree, $start_org );
 
-       my $lastid = undef;
+       my $lastid = -1;
        while( $org ) {
                last if ($apputils->check_perms( $userid, $org->id, $perm )); # perm failed
                $lastid = $org->id;

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 745df27..22d4a75 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -741,7 +741,7 @@ function holdProcessResult( hold, res, recurse ) {
                }
 
                if( grep(res, function(e) { return (e.textcode == 'HOLD_EXISTS'); }) ) {
-                       if( fetchPermOrgs('HOLD_EXISTS.override')[0] ) {
+                       if( fetchPermOrgs('HOLD_EXISTS.override')[0] != -1 ) {
                                if( confirm($('hold_dup_exists_override').innerHTML) ) {
                                        return holdsPlaceHold(hold, true);
                                }

diff --git a/Open-ILS/xul/staff_client/server/admin/adminlib.js b/Open-ILS/xul/staff_client/server/admin/adminlib.js
index 33160d0..c4d166a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/adminlib.js
+++ b/Open-ILS/xul/staff_client/server/admin/adminlib.js
@@ -53,7 +53,8 @@ function fetchHighestPermOrgs( session, userId, perms ) {
        req.send(true);
        var orgs = req.getResultObject();
        for( var i = 0; i != orgs.length; i++ ) 
-               PERMS[ perms[i] ] = ( orgs[i] != null ) ? orgs[i] : -1 ;
+               PERMS[perms[i]] = orgs[i];
+               //PERMS[ perms[i] ] = ( orgs[i] != null ) ? orgs[i] : -1 ;
        return orgs;
 }
 

diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
index e44775a..9f039f8 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
@@ -70,6 +70,7 @@ function scFetchPerms() {
        PERMS[ASSET].delete_stat_cat_entry =  orgs[11];
 }
 
+/*
 function scFetchPerm(perm) {
        var req = new RemoteRequest(
                'open-ils.actor',
@@ -78,6 +79,7 @@ function scFetchPerm(perm) {
        return req.getResultObject();
        PERMS.create_stat = req.getResultObjecdt();
 }
+*/
 
 
 function scFetchAll( session, type, orgid, callback, args ) {