Author: knguyen
Date: Fri Jun 8 15:43:31 2007
New Revision: 17524
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17524&repname=
=3Djahia
Log:
JAHIA-920: fix timebased publishing on home page
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/timebased=
publishing/TimeBasedPublishingImplService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/tim=
ebasedpublishing/TimeBasedPublishingImplService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/timebasedpublishing/TimeBasedPubli=
shingImplService.java&rev=3D17524&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/timebased=
publishing/TimeBasedPublishingImplService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/timebased=
publishing/TimeBasedPublishingImplService.java Fri Jun 8 15:43:31 2007
@@ -428,11 +428,23 @@
TimeBasedPublishingJahiaObject parent =3D timeBPObject
.getParentForTimeBasedPublishing(JahiaAdminUse=
r.getAdminUser(jahiaObject.getSiteId().intValue()),
EntryLoadRequest.STAGED,ParamBean.EDIT=
);
- JahiaObjectDelegate parentDelegate =3D jahiaObjectMgr
- .getJahiaObjectDelegate(parent.getObjectKey());
- if ( parentDelegate !=3D null ){
- return ( jahiaObject.getTimeBPState().intValue()
- !=3D parentDelegate.getTimeBPState().intVa=
lue() );
+ if ( parent !=3D null ) {
+ JahiaObjectDelegate parentDelegate =3D jahiaObject=
Mgr
+ .getJahiaObjectDelegate(parent.getObjectKe=
y());
+ if ( parentDelegate !=3D null ){
+ return ( jahiaObject.getTimeBPState().intValue=
()
+ !=3D parentDelegate.getTimeBPState().i=
ntValue() );
+ }
+ } else {
+ //case of home page without parent
+ if ( !jahiaObject.isValid() ){
+ JahiaObjectDelegate delegate =3D jahiaObjectMgr
+ .getJahiaObjectDelegate(jahiaObject.ge=
tObjectKey());
+ delegate.setTimeBPState(new Integer(IS_VALID_S=
TATE));
+ jahiaObjectMgr.save(delegate);
+ copyParentStateToCurrentObjectAndChilds(timeBP=
Object, delegate);
+ return true;
+ }
}
} catch ( Throwable t){
logger.debug("exception checking state change",t);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
