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

@@ -212,7 +212,7 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
     
     "n3required"    : [ "${n3ForNewEdTraining}", "${orgLabelAssertion}", "${orgTypeAssertion}", "${dateTimeAssertions}" ],
     
-    "n3optional"    : [ "${n3ForEdTrainingToOrg}",                                            
+    "n3optional"    : [ "${n3ForEdTrainingToOrg}", "${majorFieldAssertion}",                                          
                         "${degreeAssertion}", "${deptAssertion}", "${infoAssertion}" ],
                         
     "newResources"  : { "edTraining" : "${defaultNamespace}",

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>