Author: bpapez
Date: Wed Sep 26 16:08:37 2007
New Revision: 18674
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18674&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2399: Subcontainers cannot be deleted
- in fact the containers were marked for delete, there were two places wher=
e the entry load request for display, was not set correct (in one case alwa=
ys the LIVE content was loaded and in the other the "marked for deletion" c=
ontent was requested to be loaded
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContainerListFactoryProxy.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/JahiaContainersBaseService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/ContainerListFactoryProxy.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/ContainerListFactoryPro=
xy.java&rev=3D18674&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContainerListFactoryProxy.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContainerListFactoryProxy.java Wed Sep 26 16:08:37 2007
@@ -95,9 +95,19 @@
return;
}
try {
+ // When requesting an archived loadRequest
+ EntryLoadRequest currentLoadRequest =3D
+ (EntryLoadRequest) loadRequest.clone();
+ if (jParams.showRevisionDiff()) {
+ currentLoadRequest.setWithDeleted(true);
+ currentLoadRequest.setWithMarkedForDeletion(true);
+ } else {
+ currentLoadRequest.setWithDeleted(false);
+ currentLoadRequest.setWithMarkedForDeletion(false);
+ } =
ContainerFactory.getInstance()
.fullyLoadContainerList(containerList,
- loadFlag, jParams, loadRequest, cachedFieldsFromContainers,
+ loadFlag, jParams, currentLoadRequest, cachedFieldsFromCon=
tainers,
this.cachedContainersFromContainerLists,
this.cachedContainerListsFromContainers);
containerList.setIsContainersLoaded(true);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/JahiaContainersBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/JahiaContainersBaseServ=
ice.java&rev=3D18674&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/JahiaContainersBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/JahiaContainersBaseService.java Wed Sep 26 16:08:37 2007
@@ -1636,7 +1636,7 @@
final SessionState session =3D jParams.getSessionState();
if (session !=3D null) {
if (session.getAttribute("getSorteredAndFilteredCtnIds=
" + containerListID) =3D=3D null) {
- final Vector idsForSession =3D getctnidsInList(con=
tainerListID);
+ final Vector idsForSession =3D getctnidsInList(con=
tainerListID, loadVersion);
session.setAttribute("getSorteredAndFilteredCtnIds=
" + containerListID, idsForSession);
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
