svn commit: r596280 - in /lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases: Copy.java Cut.java

Author: andreas
Date: Mon Nov 19 04:42:43 2007
New Revision: 596280

URL: http://svn.apache.org/viewvc?rev=596280&view=rev
Log:
Don't allow to cut/copy from other areas than authoring. See bug 43861 for more information.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Copy.java
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Cut.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Copy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Copy.java?rev=596280&r1=596279&r2=596280&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Copy.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Copy.java Mon Nov 19 04:42:43 2007
@@ -17,6 +17,7 @@
  */
 package org.apache.lenya.cms.site.usecases;
 
+import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.cms.usecase.DocumentUsecase;
 
 /**
@@ -25,6 +26,16 @@
  * @version $Id$
  */
 public class Copy extends DocumentUsecase {
+
+    protected void doCheckPreconditions() throws Exception {
+        super.doCheckPreconditions();
+        if (hasErrors()) {
+            return;
+        }
+        if (!getSourceDocument().getArea().equals(Publication.AUTHORING_AREA)) {
+            addErrorMessage("only-in-authoring-area");
+        }
+    }
 
     /**
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Cut.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Cut.java?rev=596280&r1=596279&r2=596280&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Cut.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Cut.java Mon Nov 19 04:42:43 2007
@@ -33,13 +33,17 @@
 
     protected void doCheckPreconditions() throws Exception {
         super.doCheckPreconditions();
-        
+        if (hasErrors()) {
+            return;
+        }
+
         Document doc = getSourceDocument();
-        if (doc != null) {
-            SiteStructure liveSite = doc.getPublication().getArea(Publication.LIVE_AREA).getSite();
-            if (liveSite.contains(doc.getPath())) {
-                addErrorMessage(MESSAGE_ISLIVE);
-            }
+        if (!doc.getArea().equals(Publication.AUTHORING_AREA)) {
+            addErrorMessage("only-in-authoring-area");
+        }
+        SiteStructure liveSite = doc.getPublication().getArea(Publication.LIVE_AREA).getSite();
+        if (liveSite.contains(doc.getPath())) {
+            addErrorMessage(MESSAGE_ISLIVE);
         }
     }