Author: bpapez
Date: Fri Jun 15 14:35:05 2007
New Revision: 17591
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17591&repname=
=3Djahia
Log:
port of minor changes in the Jahia 5 SP branch
Modified:
trunk/core/src/java/org/jahia/engines/rights/ManageRights.java
Modified: trunk/core/src/java/org/jahia/engines/rights/ManageRights.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/rights/ManageRights.java&rev=3D17591&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/engines/rights/ManageRights.java (origina=
l)
+++ trunk/core/src/java/org/jahia/engines/rights/ManageRights.java Fri Jun =
15 14:35:05 2007
@@ -401,11 +401,11 @@
if (p instanceof JahiaUser) {
JahiaUser user =3D (JahiaUser) p;
for (int i =3D 0; i < JahiaBaseACL.RIGHTS_MAX_OFFSET; =
i++)
- permissions |=3D acl.getPermission(user, i) ? 1 <<=
i : 0;
+ permissions |=3D acl.getPermission(aclFinder, aclR=
esourceInterface, user, i) ? 1 << i : 0;
} else {
JahiaGroup group =3D (JahiaGroup) p;
for (int i =3D 0; i < JahiaBaseACL.RIGHTS_MAX_OFFSET; =
i++)
- permissions |=3D acl.getPermission(group, i) ? 1 <=
< i : 0;
+ permissions |=3D acl.getPermission(aclFinder, aclR=
esourceInterface, group, i) ? 1 << i : 0;
}
if (logger.isDebugEnabled()) logger.debug("Returning inher=
ited permissions: " + permissions);
aclEntry =3D (p instanceof JahiaUser) ? acl.getUserEntry((=
JahiaUser) p) : acl.getGroupEntry((JahiaGroup) p);
@@ -559,7 +559,7 @@
} else {
parentACL =3D acl.getParent();
}
- if (parentACL.getPermission((JahiaUser) usr_grp,
+ if (parentACL !=3D null && parentACL.getPermission((Ja=
hiaUser) usr_grp,
JahiaBaseACL.READ_RIGHTS)) {
readGroups.add(usr_grpName);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
