include (editing disabled) group perms

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

diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.js b/Open-ILS/xul/staff_client/server/patron/user_edit.js
index 6a3ba64..cb93a07 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.js
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.js
@@ -149,11 +149,7 @@ function init_editor (u) {
        if (user.id() > 0) {
                req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.user_perms.retrieve', ses_id, user.id() );
                req.send(true);
-               var up = req.getResultObject();
-               for (var i in up) {
-                       if (up[i].id() > 0)
-                               user_perms.push(up[i]);
-               }
+               user_perms = req.getResultObject();
 
                req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.retrieve' );
                req.send(true);
@@ -195,13 +191,13 @@ function display_perm (root,perm_def,staff_perms, r) {
        }
 
        for (var i in user_perms) {
-               if (perm_def.id() == user_perms[i].perm() && user_perms[i].id() > 0)
+               if (perm_def.id() == user_perms[i].perm())
                        up = user_perms[i];
        }
 
 
        var dis = false;
-       if (!sp || !sp.grantable()) dis = true; 
+       if (up.id() < 0 || !sp || !sp.grantable()) dis = true; 
        if (all) dis = false; 
 
        var label_cell = findNodeByName(prow,'plabel');