From 5d7f8486b8d678cae05bd5cff2ed5d3debf3a42f Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 2 Dec 2011 20:11:22 +0000
Subject: [PATCH] Updates for NIHVIVO-3406 and NIHVIVO-3408 - the Vitro
 NewIndividualFormGenerator needed to be updated to add label to the set of
 fields (the code for creating the field was there but it wasn't assigned to
 the edit configuration object) and the freemarker template needed to be
 updated to include the correct name/id for the label field

---
 .../NewIndividualFormGenerator.java           |  7 +++---
 .../edit/forms/newIndividualForm.ftl          | 25 +++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

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<String> urisOnForm = new ArrayList<String>();
     	List<String> literalsOnForm = new ArrayList<String>();
     	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<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
-    	getLabelField(editConfiguration, vreq, fields);
+    	setLabelField(editConfiguration, vreq, fields);
 
     }
     
-    private void getLabelField(EditConfigurationVTwo editConfiguration,
+    private void setLabelField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
     	FieldVTwo field = new FieldVTwo();
     	field.setName("label");    	
@@ -264,6 +262,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
     	field.setLiteralOptions(new ArrayList<List<String>>());
     	
     	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/>
+</#if>
+
+
 <h2>Create a new ${typeName}</h2>
 
-<#if errorNameFieldIsEmpty??>
-    <#assign errorMessage = "Enter a name." />
-</#if>
-
-<#if errorMessage?has_content>
+<#if submissionErrors?has_content >
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
-        <p>${errorMessage}</p>
+        <p>
+        <#list submissionErrors?keys as errorFieldName>
+        	<#if  errorFieldName == "label">
+        	    Please enter a value in the name field.
+    	    </#if>
+    	    <br />
+    	</#list>
+        </p>
     </section>
 </#if>
 
+
+
 <#assign requiredHint = "<span class='requiredHint'> *</span>" />
 
 <section id="newIndividual" role="region">        
@@ -26,7 +37,7 @@
  
       <p>
           <label for="name">Name ${requiredHint}</label>
-          <input size="30"  type="text" id="name" name="name" value="" />
+          <input size="30"  type="text" id="label" name="label" value="" />
       </p>
 
       <p class="submit">