[Aplaws-commit] r2330 - trunk/ccm-cms/src/com/arsdigita/cms/ui/authoring

[<pb...@fe...>]

Author: pboy
Date: 2012-12-01 09:32:20 +0000 (Sat, 01 Dec 2012)
New Revision: 2330

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java
Log:
Reverted r2326 because of regression.

Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java	2012-12-01 09:22:43 UTC (rev 2329)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java	2012-12-01 09:32:20 UTC (rev 2330)
@@ -30,11 +30,13 @@
 import com.arsdigita.bebop.parameters.DateParameter;
 import com.arsdigita.bebop.parameters.ParameterData;
 import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.util.GlobalizationUtil;
+import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.util.Assert;
 
 import javax.servlet.ServletException;
@@ -141,13 +143,21 @@
         return item;
     }
 
-    @Override
+    /*@Override
     public void validate(final FormSectionEvent fse) throws FormProcessException {
-        final Folder folder = (Folder) getItemSelectionModel().getSelectedItem(fse.getPageState()).getParent();
-        Assert.exists(folder);
-        validateNameUniqueness(folder, fse);
-    }
+        ACSObject parent = getItemSelectionModel().getSelectedItem(fse.getPageState()).getParent();
 
+
+        if (parent instanceof ContentBundle) {
+            parent = ((ContentBundle) parent).getParent();
+        }
+        if (parent instanceof Folder) {
+            final Folder folder = (Folder) parent;
+            Assert.exists(folder);
+            validateNameUniqueness(folder, fse);
+        }
+    }*/
+
     /**
      * Utility method to process the name/title widgets. Child classes
      * may call this method from the process listener.