cmailleux 2005/10/12 18:25:48 CEST
Modified files:
core/src/java/org/jahia/engines/containerlistproperties
ContainerListProperties_Engine.java
core/src/java/org/jahia/engines/rights ManageRights.java
Log:
Correct for fields rights management
Revision Changes Path
1.19 +1 -2
jahia/core/src/java/org/jahia/engines/containerlistproperties/ContainerListProperties_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/containerlistproperties/ContainerListProperties_Engine.java.diff?r1=1.18&r2=1.19&f=h
1.14 +7 -2
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.13&r2=1.14&f=h
Index: ContainerListProperties_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/containerlistproperties/ContainerListProperties_Engine.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ContainerListProperties_Engine.java 12 Oct 2005 12:23:24 -0000
1.18
+++ ContainerListProperties_Engine.java 12 Oct 2005 16:25:47 -0000
1.19
@@ -266,8 +266,7 @@
HashMap acls = (HashMap) engineMap.get ("fieldAcls");
if (acls == null)
return;
- String val = jParams.getParameter (
- "lastaclfield");
+ String val = jParams.getParameter ("aclfieldname");
Integer I = null;
if (val != null) {
I = (Integer) acls.get (val);
Index: ManageRights.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ManageRights.java 12 Oct 2005 14:40:53 -0000 1.13
+++ ManageRights.java 12 Oct 2005 16:25:48 -0000 1.14
@@ -65,7 +65,7 @@
private final Set currentAclEntriesToRemove;
private int currentInheritance;
-
+ private int lastAclIDLoaded = 0;
/**
* @return a single instance of the object
*/
@@ -91,6 +91,7 @@
readGroups.clear();
currentInheritance = 0;
logger.debug("Cache variables have been emptied");
+ lastAclIDLoaded = 0;
}
/**
@@ -109,7 +110,9 @@
throws JahiaException, JahiaSessionExpirationException {
logger.debug("handling mode : " + mode + " for acl " + aclID);
-
+ if(lastAclIDLoaded!=aclID) {
+ resetCacheVariables();
+ }
final JahiaBaseACL theACL;
final EngineValidationHelper evh = new EngineValidationHelper();
evh.setNextScreen("rightsMgmt");
@@ -177,6 +180,8 @@
JahiaException.ENGINE_ERROR,
JahiaException.ERROR_SEVERITY);
}
+ if(evh==null || !evh.hasErrors())
+ lastAclIDLoaded = aclID;
return evh;
}
