cmailleux 2005/10/07 18:32:20 CEST
Modified files:
core/src/java/org/jahia/engines/addcontainer
AddContainer_Engine.java
Log:
Ensure that if we have multiple list in a page we choose the right one
Revision Changes Path
1.29 +2 -3
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.28&r2=1.29&f=h
Index: AddContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AddContainer_Engine.java 6 Oct 2005 13:17:17 -0000 1.28
+++ AddContainer_Engine.java 7 Oct 2005 16:32:20 -0000 1.29
@@ -733,13 +733,12 @@
getJahiaContainersService();
JahiaContainerList list =
jahiaContainersService.loadContainerListInfo(theContainer.getListID());
int id =
jahiaContainersService.getContainerListID(theContainer.getDefinition().getName(),
theContainer.getPageID());
- if (id > 0) {
+ int containerParentID = ((Integer)
engineMap.get("containerParentID")).intValue();
+ if (id > 0 && (list!= null &&
list.getParentEntryID()==containerParentID && list.getID()==id )) {
list = jahiaContainersService.loadContainerListInfo(id);
theContainer.setListID(list.getID());
}
if (list == null) {
- int containerParentID = ((Integer) engineMap.get(
- "containerParentID")).intValue();
int parentAclID = 0;
if (containerParentID != 0) {
parentAclID = jahiaContainersService.
