Author: tdraier
Date: Mon Jun 25 15:29:28 2007
New Revision: 17757
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17757&repname=
=3Djahia
Log:
fixed workflow display, optimized - do not display warnings for validated p=
ages (JAHIA-1979) ( backport 17554 )
Modified:
trunk/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.java
Modified: trunk/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/sitemap/SiteMapAbstractAction.java&rev=3D17757&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/ajax/sitemap/SiteMapAbstractAction.java (=
original)
+++ trunk/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.java M=
on Jun 25 15:29:28 2007
@@ -123,11 +123,12 @@
// check for cyclic situation
//if ( main !=3D null && !main.getObjectKey().equa=
ls(object.getObjectKey()) ){
=
- if ( main instanceof ContentPage && main.getID() =
=3D=3D parentID){
+ if ((main instanceof ContentPage && ((ContentPage)=
main).getParentID(EntryLoadRequest.STAGED) !=3D object.getPageID()) ||
+ (!(main instanceof ContentPage) && main.getPa=
geID() !=3D object.getPageID())) {
continue;
}
v.add(main);
- //}
+
} else {
v.add(contentObject);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
