From 61059399b49ecd8db219e6908082ad801d10ffb6 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 7 Sep 2010 16:21:13 +0000
Subject: [PATCH] NIHVIVO-1022 Made organization type and label required on
 position history form

---
 productMods/edit/forms/personHasPositionHistory.jsp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index a2492ebb..6cc684a4 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -148,9 +148,10 @@
     "predicate" : ["predicate", "${predicateUriJson}" ],
     "object"    : ["position", "${objectUriJson}", "URI" ],
     
-    "n3required"    : [ "${n3ForNewPosition}", "${positionTitleAssertion}", "${positionTypeAssertion}", "${startYearAssertion}" ],
+    "n3required"    : [ "${n3ForNewPosition}", "${positionTitleAssertion}", "${positionTypeAssertion}", 
+    					"${orgLabelAssertion}", "${orgTypeAssertion}", "${startYearAssertion}" ],
     
-    "n3optional"    : [ "${orgLabelAssertion}", "${orgTypeAssertion}", "${endYearAssertion}" ],                        
+    "n3optional"    : [ "${endYearAssertion}" ],                        
                                                                      
     "newResources"  : { "position" : "${defaultNamespace}",
                         "org" : "${defaultNamespace}" },
@@ -209,7 +210,7 @@
       },      
       "orgLabel" : {
          "newResource"      : "false",
-         "validators"       : [  ],
+         "validators"       : [ "nonempty" ],
          "optionsType"      : "UNDEFINED",
          "literalOptions"   : [ ],
          "predicateUri"     : "",
@@ -220,7 +221,7 @@
       },
      "orgType" : {
          "newResource"      : "false",
-         "validators"       : [  ],
+         "validators"       : [ "nonempty" ],
          "optionsType"      : "CHILD_VCLASSES",
          "literalOptions"   : [ "Select one" ],
          "predicateUri"     : "",