LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix für CreateStep für GenericPerson, Prüfung für bereits vorhandenen Name des Items funktioniert wieder 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1448 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-01-13 09:28:27 +00:00
parent 89b73f5c48
commit 8e967156bb
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonCreate.java
View File

@ -78,7 +78,7 @@ public class GenericPersonCreate extends PageCreate {
public void validate(FormSectionEvent e) throws FormProcessException { public void validate(FormSectionEvent e) throws FormProcessException {
Folder f = m_parent.getFolder(e.getPageState()); Folder f = m_parent.getFolder(e.getPageState());
Assert.exists(f); Assert.exists(f);
validateNameUniqueness(f, e, GenericPerson.urlSave(getFullname(e))); validateNameUniqueness(f, e, GenericPerson.urlSave(getItemName(e)));
} }
// Process: save fields to the database // Process: save fields to the database
@ -89,7 +89,7 @@ public class GenericPersonCreate extends PageCreate {
final ContentSection section = m_parent.getContentSection(state); final ContentSection section = m_parent.getContentSection(state);
Folder folder = m_parent.getFolder(state); Folder folder = m_parent.getFolder(state);
String fullName = getFullname(e); String fullName = getItemName(e);
Assert.exists(section, ContentSection.class); Assert.exists(section, ContentSection.class);
final ContentPage item = createContentPage(state); final ContentPage item = createContentPage(state);
@ -118,31 +118,11 @@ public class GenericPersonCreate extends PageCreate {
} }
// Generate full name // Generate full name
private String getFullname(FormSectionEvent e) { private String getItemName(FormSectionEvent e) {
final FormData data = e.getFormData(); final FormData data = e.getFormData();
String titlePre = data.getString(TITLEPRE);
String givenName = data.getString(GIVENNAME); String givenName = data.getString(GIVENNAME);
String surname = data.getString(SURNAME); String surname = data.getString(SURNAME);
String titlePost = data.getString(TITLEPOST);
if (titlePre == null) { return String.format("%s %s", surname, givenName);
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();
}
} }
} }