Author: bpapez
Date: Fri Nov 9 14:26:11 2007
New Revision: 19103
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19103&repname=
=3Djahia
Log:
JAHIA-2525: new getChildAcls method
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaAclDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaAclManager.java
trunk/core/src/java/org/jahia/services/acl/JahiaACLManagerService.java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaAclDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaAclDAO.java&rev=3D19103&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/hibernate/dao/JahiaAclDAO.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaAclDAO.java Fri Nov 9=
14:26:11 2007
@@ -52,6 +52,15 @@
return findByCriteria(template, DetachedCriteria.forClass(
JahiaAcl.class).setFetchMode("entries", FetchMode.JOIN));
}
+ =
+ public List getChildAcls(Integer parentId) {
+ final HibernateTemplate template =3D getHibernateTemplate();
+ template.setCacheQueries(true);
+ template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
+ return findByCriteria(template, DetachedCriteria.forClass(
+ JahiaAcl.class).add(Restrictions.eq("parentId", parentId))
+ .setFetchMode("entries", FetchMode.JOIN));
+ } =
=
public JahiaAcl findAclById(Integer id) {
JahiaAcl acl =3D null;
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaAclManager.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaAclManager.java&rev=3D19103&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/hibernate/manager/JahiaAclManager.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaAclManager.java Fr=
i Nov 9 14:26:11 2007
@@ -31,6 +31,7 @@
import org.jahia.exceptions.JahiaInitializationException;
import org.springframework.orm.ObjectRetrievalFailureException;
=
+import java.util.Iterator;
import java.util.List;
import java.util.Collection;
=
@@ -56,6 +57,10 @@
return dao.getAcls();
}
=
+ public List getChildAcls(int parentId) {
+ return dao.getChildAcls(new Integer(parentId));
+ } =
+ =
public void setJahiaAclDAO(JahiaAclDAO dao) {
this.dao =3D dao;
}
@@ -98,8 +103,8 @@
=
public void preloadACLs(Cache mACLCache) {
List acls =3D getAllAcls();
- for (int i =3D 0; i < acls.size(); i++) {
- JahiaAcl acl =3D (JahiaAcl) acls.get(i);
+ for (Iterator it =3D acls.iterator(); it.hasNext();) { =
+ JahiaAcl acl =3D (JahiaAcl) it.next();
mACLCache.put(acl.getId(), acl);
}
}
Modified: trunk/core/src/java/org/jahia/services/acl/JahiaACLManagerService=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/acl/JahiaACLManagerService.java&rev=3D19103&repname=3Djah=
ia
=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/services/acl/JahiaACLManagerService.java =
(original)
+++ trunk/core/src/java/org/jahia/services/acl/JahiaACLManagerService.java =
Fri Nov 9 14:26:11 2007
@@ -688,8 +688,8 @@
public boolean hasWriteAccesOnAllLangs(final ProcessingContext jParams=
) throws JahiaException {
final List siteLangs =3D jParams.getSite().getLanguageSettings(tru=
e);
boolean result =3D true;
- for (int i =3D 0; i < siteLangs.size(); i++) {
- final String languageCode =3D ((SiteLanguageSettings) siteLang=
s.get(i)).getCode();
+ for (Iterator it =3D siteLangs.iterator(); it.hasNext();) { =
+ final String languageCode =3D ((SiteLanguageSettings) it.next(=
)).getCode();
result =3D result && getSiteActionPermission("engines.language=
s." +
languageCode,
jParams.getUser(),
@@ -705,6 +705,8 @@
public Collection getAllGroupsInAcl() {
return manager.findAllTarget(2);
}
-
-
+ =
+ public List getChildAcls(int parentAclId) {
+ return manager.getChildAcls(parentAclId);
+ }
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
