Author: knguyen
Date: Wed Jan 23 11:12:53 2008
New Revision: 19567
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19567&repname=
=3Djahia
Log:
correctly initialize sub container list with container list proxy.
Modified:
trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java
Modified: trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/JahiaContainerSet.java&rev=3D19567&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/data/containers/JahiaContainerSet.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java We=
d Jan 23 11:12:53 2008
@@ -34,6 +34,7 @@
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.containers.ContainerFactory;
import org.jahia.services.containers.JahiaContainersService;
+import org.jahia.services.containers.ContainerListFactoryProxy;
import org.jahia.services.metadata.FieldDefinition;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.version.EntryLoadRequest;
@@ -1617,7 +1618,7 @@
} else {
id =3D jahiaContainersService.getContainerListID(def.getNa=
me(), page, parent);
}
- final JahiaContainerList list;
+ JahiaContainerList list;
if (id =3D=3D -1) {
int parentAclID =3D 0;
if (parent !=3D 0) {
@@ -1633,6 +1634,34 @@
list =3D jahiaContainersService.loadContainerListInfo(id, =
jData.getProcessingContext().getEntryLoadRequest());
}
if (list !=3D null) {
+ // apply containers search and filtering.
+
+ // When requesting an archived loadRequest
+ EntryLoadRequest loadRequest =3D (EntryLoadRequest)jData.g=
etProcessingContext().getEntryLoadRequest().clone();
+ if (loadRequest.isVersioned()) {
+ if (this.jData.getProcessingContext().showRevisionDiff=
()) {
+ // todo not fully handle so we dont load deleted y=
et
+ loadRequest.setWithDeleted(true);
+ loadRequest.setWithMarkedForDeletion(true);
+ } else {
+ loadRequest.setWithDeleted(false);
+ if (jData.getProcessingContext().getOpMode().equal=
s(ProcessingContext.EDIT)) {
+ loadRequest.setWithMarkedForDeletion(true);
+ } else {
+ loadRequest.setWithMarkedForDeletion(false);
+ }
+ }
+ }
+ try {
+ list =3D ContainerFactory.getInstance().fullyLoadConta=
inerList(list.getID(),
+ LoadFlags.ALL,
+ this.jData.getProcessingContext(), loadRequest,
+ this.cachedFieldsFromContainers,
+ this.cachedContainersFromContainerLists,
+ this.cachedContainerListsFromContainers);
+ } catch (final Throwable t) {
+ logger.error("Error in getContainerList", t);
+ }
this.addContainerList(list);
=
int containerType =3D def.getContainerListType();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
