Author: knguyen
Date: Fri Sep 21 12:29:39 2007
New Revision: 18615
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18615&repname=
=3Djahia
Log:
JAHIA-2170: fix time based publishing inheritance from parent in Editing en=
gine.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/timebasedp=
ublishing/TimeBasedPublishingEngine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/time=
basedpublishing/TimeBasedPublishingEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/timebasedpublishing/TimeBasedPublis=
hingEngine.java&rev=3D18615&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/engines/timebasedp=
ublishing/TimeBasedPublishingEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/timebasedp=
ublishing/TimeBasedPublishingEngine.java Fri Sep 21 12:29:39 2007
@@ -19,6 +19,7 @@
=
import org.jahia.content.ObjectKey;
import org.jahia.content.ContentObject;
+import org.jahia.content.TimeBasedPublishingJahiaObject;
import org.jahia.engines.JahiaEngine;
import org.jahia.engines.validation.EngineValidationHelper;
import org.jahia.engines.validation.ValidationError;
@@ -442,7 +443,33 @@
logger.debug("old: " + oldRule);
logger.debug("new: " + rule);
if (isSame(oldRule,rule)) {
- return true;
+ boolean applyParentState =3D false;
+ if ( rule.getId().intValue() =3D=3D -1 ){
+ // newly rule, we have to check on parent
+ try {
+ ContentObject contentObject =3D ContentObject.getC=
ontentObjectInstance(objectKey);
+ if ( contentObject instanceof TimeBasedPublishingJ=
ahiaObject ){
+ TimeBasedPublishingJahiaObject parentObject =
=3D ((TimeBasedPublishingJahiaObject)contentObject)
+ .getParentForTimeBasedPublishing(jPara=
ms.getUser(),jParams.getEntryLoadRequest(),
+ jParams.getOperationMode());
+ if ( parentObject !=3D null ){
+ final JahiaObjectManager jahiaObjectManage=
r =3D
+ (JahiaObjectManager) SpringContext=
Singleton.getInstance()
+ .getContext().getBean(Jahi=
aObjectManager.class.getName());
+ JahiaObjectDelegate parentObjectDelegate =
=3D jahiaObjectManager
+ .getJahiaObjectDelegate(parentObje=
ct.getObjectKey());
+ if ( parentObjectDelegate.isNotValid() || =
parentObjectDelegate.isExpired()
+ || parentObjectDelegate.willExpire=
(System.currentTimeMillis()) ){
+ applyParentState =3D true;
+ }
+ }
+ }
+ } catch ( Throwable t ){
+ }
+ }
+ if( !applyParentState ){
+ return true;
+ }
}
jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
