[Yanel-commits] rev 42894 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2009-05-18 21:56:29 +0200 (Mon, 18 May 2009)
New Revision: 42894

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
check revision if live

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2009-05-18 19:40:54 UTC (rev 42893)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2009-05-18 19:56:29 UTC (rev 42894)
@@ -503,9 +503,11 @@
 
                             WorkflowableV1 workflowableResource = null;
                             Workflow workflow = null;
+                            String liveRevisionName = null;
                             if (ResourceAttributeHelper.hasAttributeImplemented(res, "Workflowable", "1")) {
                                 workflowableResource = (WorkflowableV1)res;
                                 workflow = WorkflowHelper.getWorkflow(res);
+                                liveRevisionName = WorkflowHelper.getLiveRevision(res);
 		     	    }
 
                             if (revisionsInfo != null && revisionsInfo.length > 0) {
@@ -527,7 +529,11 @@
                                         if (wfState  == null) {
                                            wfState = workflow.getInitialState();
                                         }
-                                        revisionWorkflowElement.appendChild(doc.createTextNode(wfState));
+                                        if (liveRevisionName != null && revisionsInfo[i].getName().equals(liveRevisionName)) {
+                                            revisionWorkflowElement.appendChild(doc.createTextNode(wfState + " (LIVE)"));
+                                        } else {
+                                            revisionWorkflowElement.appendChild(doc.createTextNode(wfState));
+                                        }
                                     }
                                 }
                             } else {