Author: tdraier
Date: Wed Jun 13 19:04:11 2007
New Revision: 17554
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17554&repname=
=3Djahia
Log:
Fixed workflow display, optimised - do not display warnings for validated p=
ages (JAHIA-1979)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM=
apAbstractAction.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap=
/SiteMapAbstractAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.java&rev=
=3D17554&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/ajax/sitemap/SiteM=
apAbstractAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM=
apAbstractAction.java Wed Jun 13 19:04:11 2007
@@ -122,10 +122,11 @@
final ContentObject main =3D workflowService.getMa=
inLinkObject(contentObject);
// 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 {
@@ -561,17 +562,20 @@
final HTMLToolBox html =3D new GuiBean(jParams).html();
final Set languageCodes =3D getLanguageSet(locales);
=
- final ActivationTestResults results =3D workflowService.isValidFor=
Activation(object, languageCodes,
- jParams, new StateModificationContext(objectKey, languageC=
odes, false));
-
- if (results.getWarnings().size() > 0) {
- item.setAttribute("warnings", html.drawShowReportLauncher(obje=
ctKey.toString()));
- ((ParamBean) jParams).getRequest().getSession().setAttribute(o=
bjectKey.toString(), results);
- }
+ if (languagesStates.containsValue(new Integer(EntryLoadRequest.STA=
GING_WORKFLOW_STATE)) ||
+ languagesStates.containsValue(new Integer(EntryLoadRequest=
.WAITING_WORKFLOW_STATE))) {
+ final ActivationTestResults results =3D workflowService.isVali=
dForActivation(object, languageCodes,
+ jParams, new StateModificationContext(objectKey, langu=
ageCodes, false));
+
+ if (results.getWarnings().size() > 0) {
+ item.setAttribute("warnings", html.drawShowReportLauncher(=
objectKey.toString()));
+ ((ParamBean) jParams).getRequest().getSession().setAttribu=
te(objectKey.toString(), results);
+ }
=
- if (results.getErrors().size() > 0) {
- item.setAttribute("errors", html.drawShowReportLauncher(object=
Key.toString()));
- ((ParamBean) jParams).getRequest().getSession().setAttribute(o=
bjectKey.toString(), results);
+ if (results.getErrors().size() > 0) {
+ item.setAttribute("errors", html.drawShowReportLauncher(ob=
jectKey.toString()));
+ ((ParamBean) jParams).getRequest().getSession().setAttribu=
te(objectKey.toString(), results);
+ }
}
=
boolean doLock =3D false;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
