knguyen 2004/09/24 18:22:49 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/engines/shared Page_Field.java
Log:
- do not delete container - page move option, missed merge fix
Revision Changes Path
1.72.4.6 +26 -17 jahia/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.72.4.5&r2=1.72.4.6&f=h
Index: Page_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/shared/Attic/Page_Field.java,v
retrieving revision 1.72.4.5
retrieving revision 1.72.4.6
diff -u -r1.72.4.5 -r1.72.4.6
--- Page_Field.java 23 Sep 2004 16:31:21 -0000 1.72.4.5
+++ Page_Field.java 24 Sep 2004 16:22:48 -0000 1.72.4.6
@@ -592,26 +592,35 @@
pageChildCache.remove (Integer.toString (oldParentPageID));
// 6. Delete or not the old parent container
- if (oldParentFieldID != -1) {
- // 1. Cut the page link in the parent field value
- ContentPageField contentPageField = (ContentPageField)
ContentPageField.getField (
+ if (pageBean.deleteOldContainer()){
+ if (oldParentFieldID != -1) {
+ // 1. Cut the page link in the parent field value
+ ContentPageField contentPageField = (ContentPageField)
+ ContentPageField.getField(
oldParentFieldID);
- // mark the parent container for deletion
+ // mark the parent container for deletion
- if (contentPageField != null) {
- try {
- ContentContainer parentContainer =
- ContentContainer.getContainer
(contentPageField.getContainerID ());
- StateModificationContext stateModificationContext =
- new StateModificationContext
(parentContainer.getObjectKey (), null, true);
- stateModificationContext.popAllLanguages ();
- parentContainer.markLanguageForDeletion (jParams.getUser(),
-
ContentObject.SHARED_LANGUAGE,
+ if (contentPageField != null) {
+ try {
+ ContentContainer parentContainer =
+ ContentContainer.getContainer(contentPageField.
+ getContainerID());
+ StateModificationContext stateModificationContext =
+ new StateModificationContext(parentContainer.
+ getObjectKey(), null, true);
+ stateModificationContext.popAllLanguages();
+ parentContainer.markLanguageForDeletion(jParams.
+ getUser(),
+ ContentObject.SHARED_LANGUAGE,
stateModificationContext);
- } catch (Throwable t) {
- logger.debug (
- "Parent Container [" +
contentPageField.getContainerID ()
- + "] of page field[" + contentPageField.getID () +
"] not found");
+ }
+ catch (Throwable t) {
+ logger.debug(
+ "Parent Container [" +
+ contentPageField.getContainerID()
+ + "] of page field[" + contentPageField.getID() +
+ "] not found");
+ }
}
}
}
