NIHVIVO-193 Fix creation of new organization in the person has position history form. Fix typos in processRdfForm2.jsp.

productMods/edit/forms/js/customForm.js

@@ -38,11 +38,16 @@ var customForm = {
         // Clear all form data and error messages
         $('input:text').val('');
         $('.error').text('');
+        
         // Remove previously bound event handlers
-        //this.cancel.unbind('click');
-        this.button.unbind('click');    
+        this.cancel.unbind('click');
+        this.button.unbind('click'); 
+        
+        removeRequiredHints();
         
         initAddForm();
+        
+        return false;
     },
 
     // Set up add form on page load, or when returning to initial state
@@ -85,6 +90,7 @@ var customForm = {
             $(this).unbind('click');
             
             // RY This would return us to step 1, but it's not working
+            //customForm.cancel.unbind('click');
             //customForm.cancel.bind('click', customForm.resetAddForm);  
             
             return false;              

productMods/edit/forms/personHasPositionHistory.jsp

@@ -129,6 +129,7 @@
     ?newOrg <${type}> ?newOrgType .
     ?positionUri <${positionInOrgPred}> ?newOrg .
     ?newOrg <${orgForPositionPred}> ?positionUri .
+    ?newOrg <${type}> <${flagURI}> .
 </v:jsonset>
 
 <v:jsonset var="positionClassUriJson">${positionClass}</v:jsonset>
@@ -178,7 +179,7 @@
          "literalOptions"   : [ ],
          "predicateUri"     : "",
          "objectClassUri"   : "",
-         "rangeDatatypeUri" : "",
+         "rangeDatatypeUri" : "${stringDatatypeUriJson}",
          "rangeLang"        : "",
          "assertions"       : [ "${titleAssertion}" ]
       },
@@ -205,7 +206,7 @@
          "assertions"       : [ "${organizationUriAssertion}" ]
       },      
       "newOrgName" : {
-         "newResource"      : "true",
+         "newResource"      : "false",
          "validators"       : [  ],
          "optionsType"      : "UNDEFINED",
          "literalOptions"   : [ ],