diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java index 9208ccdca..acdef6fbc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java @@ -204,8 +204,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator { List urisOnForm = new ArrayList(); List literalsOnForm = new ArrayList(); literalsOnForm.add("label"); - literalsOnForm.add("firstName"); - literalsOnForm.add("lastName"); editConfiguration.setUrisOnform(urisOnForm); editConfiguration.setLiteralsOnForm(literalsOnForm); } @@ -237,11 +235,11 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator { private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) { Map fields = new HashMap(); - getLabelField(editConfiguration, vreq, fields); + setLabelField(editConfiguration, vreq, fields); } - private void getLabelField(EditConfigurationVTwo editConfiguration, + private void setLabelField(EditConfigurationVTwo editConfiguration, VitroRequest vreq, Map fields) { FieldVTwo field = new FieldVTwo(); field.setName("label"); @@ -264,6 +262,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator { field.setLiteralOptions(new ArrayList>()); fields.put(field.getName(), field); + editConfiguration.setFields(fields); } diff --git a/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl b/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl index 0606ae1fc..bd53e0518 100644 --- a/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl @@ -5,19 +5,30 @@ <#--Retrieve certain edit configuration information--> <#assign typeName = editConfiguration.pageData.typeName /> +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> + + +

Create a new ${typeName}

-<#if errorNameFieldIsEmpty??> - <#assign errorMessage = "Enter a name." /> - - -<#if errorMessage?has_content> +<#if submissionErrors?has_content > + + <#assign requiredHint = " *" />
@@ -26,7 +37,7 @@

- +