From 8e967156bb9344ce2f10809758da4b5239de39db Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 13 Jan 2012 09:28:27 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20f=C3=BCr=20CreateStep=20f=C3=BCr=20Generi?= =?UTF-8?q?cPerson,=20Pr=C3=BCfung=20f=C3=BCr=20bereits=20vorhandenen=20Na?= =?UTF-8?q?me=20des=20Items=20funktioniert=20wieder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1448 8810af33-2d31-482b-a856-94f89814c4df --- .../contenttypes/ui/GenericPersonCreate.java | 32 ++++--------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonCreate.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonCreate.java index 0be5f6b8b..55e882077 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonCreate.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonCreate.java @@ -78,7 +78,7 @@ public class GenericPersonCreate extends PageCreate { public void validate(FormSectionEvent e) throws FormProcessException { Folder f = m_parent.getFolder(e.getPageState()); Assert.exists(f); - validateNameUniqueness(f, e, GenericPerson.urlSave(getFullname(e))); + validateNameUniqueness(f, e, GenericPerson.urlSave(getItemName(e))); } // Process: save fields to the database @@ -89,7 +89,7 @@ public class GenericPersonCreate extends PageCreate { final ContentSection section = m_parent.getContentSection(state); Folder folder = m_parent.getFolder(state); - String fullName = getFullname(e); + String fullName = getItemName(e); Assert.exists(section, ContentSection.class); final ContentPage item = createContentPage(state); @@ -118,31 +118,11 @@ public class GenericPersonCreate extends PageCreate { } // Generate full name - private String getFullname(FormSectionEvent e) { - final FormData data = e.getFormData(); - String titlePre = data.getString(TITLEPRE); + private String getItemName(FormSectionEvent e) { + final FormData data = e.getFormData(); String givenName = data.getString(GIVENNAME); - String surname = data.getString(SURNAME); - String titlePost = data.getString(TITLEPOST); + String surname = data.getString(SURNAME); - if (titlePre == null) { - titlePre = ""; - } - if (titlePost == null) { - titlePost = ""; - } - if (givenName == null) { - givenName = ""; - } - if (surname == null) { - surname = ""; - } - - if (titlePost.trim().isEmpty()) { - return String.format("%s %s %s", titlePre, givenName, surname).trim(); - } else { - return String.format("%s %s %s, %s", titlePre, givenName, surname, - titlePost).trim(); - } + return String.format("%s %s", surname, givenName); } }