From 8c1e3cde9354d369ec109a047ff68e6973ed1991 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Wed, 4 Jun 2014 16:56:49 -0400
Subject: [PATCH] VIVO-654: make role label fields on custom forms optional
 input, not required

---
 .../edit/forms/addPresenterRoleToPerson.ftl   |  5 +---
 .../edit/forms/addRoleToPersonTwoStage.ftl    |  2 +-
 .../AddPresenterRoleToPersonGenerator.java    | 23 +++++++++----------
 .../AddRoleToPersonTwoStageGenerator.java     |  3 ---
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
index 84b7ef74..c0429914 100644
--- a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
@@ -73,9 +73,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <#if lvf.submissionErrorExists(editSubmission, "presentationLabel")>
  	        ${i18n().select_or_enter_name}
         </#if> 
-        <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
- 	        ${i18n().enter_new_role_value}
-        </#if> 
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
@@ -128,7 +125,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <input class="acUriReceiver" type="hidden" id="presentationUri" name="existingPresentation" value="${existingPresentationValue}" ${flagClearLabelForExisting}="true" />
     </div>
      
-    <p><label for="roleLabel">${i18n().role_in} ${i18n().presentation_capitalized} ${requiredHint} <span class="hint">(${i18n().presentation_hint})</span></label>
+    <p><label for="roleLabel">${i18n().role_in} ${i18n().presentation_capitalized} <span class="hint">(${i18n().presentation_hint})</span></label>
         <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabelValue}" />
     </p>
   <p>
diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index b8e5981f..892af9e8 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -179,7 +179,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             </div>
 
             <#if showRoleLabelField = true>
-            <p><label for="roleLabel">${i18n().role_in} ${genericLabel?capitalize} ${requiredHint} ${roleExamples}</label>
+            <p><label for="roleLabel">${i18n().role_in} ${genericLabel?capitalize} ${roleExamples}</label>
                 <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabel}" />
             </p>
         	</#if>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
index 78a1f6ce..ed2591be 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
@@ -58,9 +58,9 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("role");
         
-        conf.setN3Required( Arrays.asList( n3ForNewRole, 
-                                           roleLabelAssertion) );
-        conf.setN3Optional( Arrays.asList( n3ForNewPresentation, 
+        conf.setN3Required( Arrays.asList( n3ForNewRole ) );
+        conf.setN3Optional( Arrays.asList( n3ForRoleLabelAssertion,
+										   n3ForNewPresentation, 
                                            n3ForExistingPresentation, 
                                            n3ForNewConferenceNewPres, 
                                            n3ForNewConferenceExistingPres, 
@@ -125,10 +125,9 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
                 );
  
         conf.addField( new FieldVTwo().                        
-                setName("roleLabel")
-                .setRangeDatatypeUri( XSD.xstring.toString() ).
-                setValidators( list("nonempty") )
-                );
+                setName("roleLabel").
+                setRangeDatatypeUri( XSD.xstring.toString() ).
+                setValidators(list("datatype:" + XSD.xstring.toString())));
 
         conf.addField( new FieldVTwo(). // an autocomplete field
                 setName("existingConference") 
@@ -169,14 +168,14 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
 
     /* N3 assertions  */
     final static String n3ForNewRole = 
-        "@prefix core: <" + vivoCore + "> . \n\n" +   
+        "@prefix core: <" + vivoCore + "> . \n" +   
         "?person <" + hasRolePred + ">  ?role . \n" +
-        "?role a  <" + roleClass + "> . \n" +              
+        "?role a  <" + roleClass + "> . \n" + 
         "?role <" + roleOfPred + "> ?person . ";
+
+	final static String n3ForRoleLabelAssertion = 
+		"?role <" + label + "> ?roleLabel . ";             
          
-    final static String roleLabelAssertion =
-        "?role <" + label + "> ?roleLabel .";
-        
     final static String n3ForNewPresentation = 
         "?role <" + roleRealizedInPred + "> ?presentation . \n" + 
         "?presentation <" + realizedRolePred + "> ?role . \n" +    
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
index ea76d04b..575c0345 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
@@ -737,9 +737,6 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura
 
     	List<String> validators = new ArrayList<String>();
     	validators.add("datatype:" + stringDatatypeUri);
-    	if(isShowRoleLabelField()) {
-    		validators.add("nonempty");
-    	}
     	field.setValidators(validators);    	    	    	    	
     	    	
     	fields.put(field.getName(), field);