Author: tdraier
Date: Fri Sep 14 13:38:52 2007
New Revision: 18493
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18493&repname=
=3Djahia
Log:
fixed aclpatch (port 18361)
Modified:
trunk/core/src/webapp/WEB-INF/etc/patches/aclpatch_17886.groovy
Modified: trunk/core/src/webapp/WEB-INF/etc/patches/aclpatch_17886.groovy
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/patches/aclpatch_17886.groovy&rev=3D18493&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/webapp/WEB-INF/etc/patches/aclpatch_17886.groovy (origin=
al)
+++ trunk/core/src/webapp/WEB-INF/etc/patches/aclpatch_17886.groovy Fri Sep=
14 13:38:52 2007
@@ -14,11 +14,9 @@
import org.jahia.services.fields.ContentField
import org.jahia.services.containers.ContentContainerList
=
- Set toDelete =3D new HashSet();
-
JahiaACLManagerService service =3D ServicesRegistry.getInstance().getJ=
ahiaACLManagerService();
=
- private void parseObject (ContentObject object, JahiaBaseACL currentAc=
l) throws Exception {
+ private void parseObject (ContentObject object, JahiaBaseACL currentAc=
l, Set toDelete) throws Exception {
JahiaAcl currentObjectAcl =3D object.getACL().getACL();
=
print(object.getObjectKey().toString() + " , aclid =3D "+currentOb=
jectAcl.getAclID());
@@ -78,7 +76,7 @@
Iterator iterator =3D objects.iterator();
while(iterator.hasNext()) {
ContentObject child =3D (ContentObject) iterator.next();
- parseObject(child, currentAcl);
+ parseObject(child, currentAcl, toDelete);
}
=
}
@@ -105,10 +103,20 @@
}
}
=
+ Set toDelete =3D new HashSet();
Enumeration en =3D ServicesRegistry.getInstance().getJahiaSitesService=
().getSites();
while (en.hasMoreElements()) {
JahiaSite jahiaSite =3D (JahiaSite) en.nextElement()
ContentPage homePage =3D jahiaSite.getHomeContentPage()
- parseObject(homePage, homePage.getACL())
+ parseObject(homePage, homePage.getACL(), toDelete)
parseObjectForPickers(homePage)
}
+ JahiaAclManager aclManager =3D (JahiaAclManager) SpringContextSingleto=
n.getInstance().getContext().getBean(JahiaAclManager.class.getName());
+ Iterator iterator =3D toDelete.iterator();
+ while (iterator.hasNext()) {
+ try {
+ Integer acl =3D (Integer) iterator.next();
+ aclManager.remove(""+acl);
+ } catch (Exception e) {
+ }
+ }
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
