xlawrence 2005/07/18 14:18:06 CEST
Modified files:
core/src/java/org/jahia/engines/rights ManageRights.java
Log:
Cleanup
Revision Changes Path
1.8 +6 -10
jahia/core/src/java/org/jahia/engines/rights/ManageRights.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java.diff?r1=1.7&r2=1.8&f=h
Index: ManageRights.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ManageRights.java 15 Jul 2005 15:23:54 -0000 1.7
+++ ManageRights.java 18 Jul 2005 12:18:05 -0000 1.8
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Collection;
-import java.util.ArrayList;
import java.util.Map;
import java.security.Principal;
import org.jahia.content.ContentObject;
@@ -102,7 +101,7 @@
currentAclEntries.clear();
currentAclEntriesToRemove.clear();
readGroups.clear();
- currentInheritance = 0;
+ currentInheritance = -1;
logger.debug("Cache variables have been emptied");
}
@@ -140,7 +139,7 @@
evh.addError(ve);
return evh;
}
- SessionState session = jParams.getSessionState ();
+ final SessionState session = jParams.getSessionState ();
session.setAttribute ("jahia_session_acl", theACL);
switch (mode) {
case (JahiaEngine.LOAD_MODE):
@@ -307,14 +306,12 @@
permissions += acl.getPermission((JahiaUser) p,
JahiaBaseACL.ADMIN_RIGHTS) ?
4 : 0;
} else {
- permissions += acl.getPermission((JahiaGroup) p,
JahiaBaseACL.READ_RIGHTS) ?
- 1 : 0;
+ permissions += acl.getPermission((JahiaGroup) p,
+ JahiaBaseACL.READ_RIGHTS) ? 1 : 0;
permissions += acl.getPermission((JahiaGroup) p,
- JahiaBaseACL.WRITE_RIGHTS) ?
- 2 : 0;
+ JahiaBaseACL.WRITE_RIGHTS) ? 2 : 0;
permissions += acl.getPermission((JahiaGroup) p,
- JahiaBaseACL.ADMIN_RIGHTS) ?
- 4 : 0;
+ JahiaBaseACL.ADMIN_RIGHTS) ? 4 : 0;
}
logger.debug("Returning inherited permissions: " +
permissions);
return permissions;
@@ -539,7 +536,6 @@
logger.debug("Cut inheritance for group : " +
usr_grpName);
}
setACLEntry(usr_grp, permissions, acl);
- currentInheritance = ACLInfo.NO_INHERITANCE;
} else if (submitedACLEntries[i].charAt(2) == '1') {
if (isUser) {
