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

[michi at wyona.com]

Author: michi
Date: 2009-08-12 10:55:42 +0200 (Wed, 12 Aug 2009)
New Revision: 44144

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
Log:
check the live status

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java	2009-08-12 08:49:52 UTC (rev 44143)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java	2009-08-12 08:55:42 UTC (rev 44144)
@@ -92,10 +92,17 @@
                             } else {
                                 sb.append("<li>");
                             }
-                            sb.append("R: " + revisions[i].getName() + " ("+revisions[i].getDate()+"), WS: " + wfState + " (" + ((WorkflowableV1)resource).getWorkflowDate(revisions[i].getName()) + ")&#160;&#160;&#160;");
+
+                            String liveMarker = "";
+                            //log.debug("Live status: " + WorkflowHelper.getLiveRevision(resource));
+                            if (revisions[i].getName().equals(WorkflowHelper.getLiveRevision(resource))) {
+                                liveMarker = " (LIVE)";
+                            }
+                            sb.append("R: " + revisions[i].getName() + " ("+revisions[i].getDate()+"), WS: " + wfState + liveMarker + " (" + ((WorkflowableV1)resource).getWorkflowDate(revisions[i].getName()) + ")&#160;&#160;&#160;");
                             if (transitions.length > 0) {
                                 sb.append("<ul>");
                                 for (int j = 0; j < transitions.length; j++) {
+                                    // TODO: &yanel.resource.workflow.transition.output=xhtml
                                     sb.append("<li><a href=\"?yanel.resource.workflow.transition=" + transitions[j].getID() + "&amp;yanel.resource.revision=" + revisions[i].getName() + "\">Transition: " + transitions[j].getDescription("en") + "</a></li>");
                                 }
                                 sb.append("</ul>");