From f4e6b8f5cb532d0abff90f4bf09ae896d219eeb2 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 5 Jun 2012 19:29:28 +0000 Subject: [PATCH] Validerung auf doppelten Namen wieder entfernt, da diese bei einigen Content-Typen (Address) Probleme verursacht hat. git-svn-id: https://svn.libreccm.org/ccm/trunk@1685 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/ui/authoring/BasicPageForm.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java index 1f0d34a2f..a3dd23db3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java @@ -30,11 +30,13 @@ import com.arsdigita.bebop.event.ParameterListener; 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,12 +143,20 @@ public abstract class BasicPageForm extends BasicItemForm { 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