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

[michi at wyona.com]

Author: michi
Date: 2009-02-02 12:58:51 +0100 (Mon, 02 Feb 2009)
New Revision: 41266

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
check re roll-back implemented

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-02-02 11:12:32 UTC (rev 41265)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2009-02-02 11:58:51 UTC (rev 41266)
@@ -273,7 +273,7 @@
                 return;
 	    } else if (value != null && value.equals("roll-back")) {
                 log.debug("Roll back ...");
-                org.wyona.yanel.core.util.VersioningUtil.rollBack(resource, request.getParameter("yanel.resource.revision"));
+                org.wyona.yanel.core.util.VersioningUtil.rollBack(resource, request.getParameter(YANEL_RESOURCE_REVN));
                 // TODO: Send confirmation screen
                 getContent(request, response);
                 return;
@@ -467,7 +467,8 @@
 
                         try {
                             String revisionName = request.getParameter(YANEL_RESOURCE_REVN);
-                            if (revisionName != null && ResourceAttributeHelper.hasAttributeImplemented(res, "Versionable", "2")) {
+                            // NOTE: Check also if usecase is not roll-back, because roll-back is also using the yanel.resource.revision
+                            if (revisionName != null && ResourceAttributeHelper.hasAttributeImplemented(res, "Versionable", "2") && !request.getParameter(YANEL_RESOURCE_USECASE).equals("roll-back")) {
                                 view = ((VersionableV2) res).getView(viewId, revisionName);
                             } else if (ResourceAttributeHelper.hasAttributeImplemented(res, "Workflowable", "1") && environment.getStateOfView().equals(StateOfView.LIVE)) {
                                 WorkflowableV1 workflowable = (WorkflowableV1)res;