litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-753 Undo toggling of last name field label, and javascript name-fixing. See discussion under NIHVIVO-444 for the rationale behind these changes.

Browse source 
NIHVIVO-725 More work on publication form.
This commit is contained in:
rjy7 2010-07-07 14:57:18 +00:00
parent 717e09e2cd
commit 11455c5757
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java
View file

@ -12,7 +12,8 @@ public class PublicationHasAuthorValidator implements N3Validator {
private static String MISSING_AUTHOR_ERROR = "Must specify a new or existing author."; private static String MISSING_AUTHOR_ERROR = "Must specify a new or existing author.";
private static String MISSING_FIRST_NAME_ERROR = "Must specify the author's first name."; private static String MISSING_FIRST_NAME_ERROR = "Must specify the author's first name.";
private static String MISSING_LAST_NAME_ERROR = "Must specify the author's last name."; private static String MISSING_LAST_NAME_ERROR = "Must specify the author's last name.";
private static String MALFORMED_LAST_NAME_ERROR = "Last name may not contain a comma. Please enter first name in first name field.";
;
@Override @Override
public Map<String, String> validate(EditConfiguration editConfig, public Map<String, String> validate(EditConfiguration editConfig,
EditSubmission editSub) { EditSubmission editSub) {
@ -36,14 +37,24 @@ public class PublicationHasAuthorValidator implements N3Validator {
firstName = null; firstName = null;
Literal lastName = literalsFromForm.get("lastName"); Literal lastName = literalsFromForm.get("lastName");
if( lastName != null && lastName.getLexicalForm() != null && "".equals(lastName.getLexicalForm()) ) String lastNameValue = "";
lastName = null; if (lastName != null) {
lastNameValue = lastName.getLexicalForm();
if (lastName != null && firstName == null) { if( "".equals(lastNameValue) ) {
errors.put("firstName", MISSING_FIRST_NAME_ERROR); lastName = null;
} else if (lastName == null && firstName != null) { }
errors.put("lastName", MISSING_LAST_NAME_ERROR);
} }
if (lastName == null) {
errors.put("lastName", MISSING_LAST_NAME_ERROR);
// Don't reject space in the last name: de Vries, etc.
} else if (lastNameValue.contains(",")) {
errors.put("lastName", MALFORMED_LAST_NAME_ERROR);
}
if (firstName == null) {
errors.put("firstName", MISSING_FIRST_NAME_ERROR);
}
return errors.size() != 0 ? errors : null; return errors.size() != 0 ? errors : null;
} }