From 3e7f1f7ab0fb932883588cc4a4f3c60939b093e4 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 10 Dec 2010 15:56:13 +0000
Subject: [PATCH] NIHVIVO-1467 Added majorFieldAssertion to n3optional. Also
 added note to educational training short view to remind us to account for the
 optionality of the major field in the new short view template.

---
 productMods/edit/forms/personHasEducationalTraining.jsp       | 2 +-
 productMods/templates/entity/educationalTrainingShortView.jsp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp
index 1a2c8fb0..4a30b2bf 100644
--- a/productMods/edit/forms/personHasEducationalTraining.jsp
+++ b/productMods/edit/forms/personHasEducationalTraining.jsp
@@ -212,7 +212,7 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
     
     "n3required"    : [ "${n3ForNewEdTraining}", "${orgLabelAssertion}", "${orgTypeAssertion}", "${dateTimeAssertions}" ],
     
-    "n3optional"    : [ "${n3ForEdTrainingToOrg}",                                            
+    "n3optional"    : [ "${n3ForEdTrainingToOrg}", "${majorFieldAssertion}",                                          
                         "${degreeAssertion}", "${deptAssertion}", "${infoAssertion}" ],
                         
     "newResources"  : { "edTraining" : "${defaultNamespace}",
diff --git a/productMods/templates/entity/educationalTrainingShortView.jsp b/productMods/templates/entity/educationalTrainingShortView.jsp
index fe7774cd..580beca1 100644
--- a/productMods/templates/entity/educationalTrainingShortView.jsp
+++ b/productMods/templates/entity/educationalTrainingShortView.jsp
@@ -25,6 +25,7 @@
                     <c:set var="degreeLabel" value="${!empty degreeAbbr ? degreeAbbr : degreeType.name }" />               
                 </c:if>
 
+                <%-- RY 12/10/10 majorField is no longer required, so make sure we display something reasonable if there is no major field. --%>
                 <c:set var="degreeMajor" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#majorField'].dataPropertyStatements[0].data}"/>
 
                 <c:choose>