From 2db6b67186406f3d10154547edbbafa6f9c892d9 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 23 Jul 2010 20:48:30 +0000
Subject: [PATCH] Merge r1120 from
 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

---
 productMods/edit/forms/addRoleToPersonTwoStage.jsp   | 12 ------------
 .../forms/js/customFormWithAdvanceTypeSelection.js   | 11 ++++-------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 1838ff2d..14b2cd90 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -298,17 +298,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
          "rangeLang"        : "",         
          "assertions"       : [ "${n3ForRoleToActivity}" ]
       },
-      "existingActivityLabel" : { /* Needed iff we return from an invalid submission */
-         "newResource"      : "false",
-         "validators"       :  [ ],
-         "optionsType"      : "UNDEFINED",
-         "literalOptions"   : [ ],
-         "predicateUri"     : "",
-         "objectClassUri"   : "",
-         "rangeDatatypeUri" : "",
-         "rangeLang"        : "",         
-         "assertions"       : [ ]
-      },
       "roleLabel" : {
          "newResource"      : "false",
          "validators"       : [ "nonempty","datatype:${stringDatatypeUriJson}" ],
@@ -417,7 +406,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 		        <%-- RY maybe make this a label and input field. See what looks best. --%>
 		        <p class="inline"><label></label><span class="acSelectionInfo"></span> <a href="<c:url value="/individual?uri=" />" class="verifyMatch">(Verify this match)</a></p>
 		        <v:input type="hidden" id="roleActivityURI" name="roleActivity" cssClass="acUriReceiver" /> <!-- Field value populated by JavaScript -->
-		        <v:input type="hidden" id="existingActivityLabel" name="existingActivityLabel" cssClass="acLabelReceiver" /> <%-- Needed iff we return from an invalid submission --%> 
 		    </div>
 	
 	        <p><v:input type="text" id="newIndLabel" name="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p>
diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
index 0d532fdf..cbcf01c7 100644
--- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
+++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
@@ -53,7 +53,7 @@ var customForm = {
         this.acSelection = this.form.find('.acSelection');
         this.acSelectionInfo = this.form.find('.acSelectionInfo');
         this.acUriReceiver = this.form.find('.acUriReceiver');
-        this.acLabelReceiver = this.form.find('.acLabelReceiver');
+        //this.acLabelReceiver = this.form.find('.acLabelReceiver');
         this.verifyMatch = this.form.find('.verifyMatch');    
         this.verifyMatchBaseHref = this.verifyMatch.attr('href');    
         this.acSelectorWrapper = this.acSelector.parent();
@@ -161,7 +161,7 @@ var customForm = {
     
     initFormWithValidationErrors: function() {
         var uri = this.acUriReceiver.val(), 
-            label = this.acLabelReceiver.val();
+            label = this.acSelector.val(); 
         
         // Call initFormFullView first, because showAutocompleteSelection needs
         // acType, which is set in initFormFullView. 
@@ -324,7 +324,7 @@ var customForm = {
     showAutocompleteSelection: function(label, uri) {
 
         this.acSelectorWrapper.hide();
-        this.acSelector.attr('disabled', 'disabled');
+        //this.acSelector.attr('disabled', 'disabled');
         
         // If only one form step, type is pre-selected, and the label is coded in the html.
         if (this.formSteps > 1) {
@@ -334,7 +334,6 @@ var customForm = {
         this.acSelection.show();
 
         this.acUriReceiver.val(uri);
-        this.acLabelReceiver.val(label); // RY PROBABLY DON"T NEED THIS AT ALL????
         this.acSelector.val(label);
         this.acSelectionInfo.html(label);
         this.verifyMatch.attr('href', this.verifyMatchBaseHref + uri);
@@ -354,11 +353,9 @@ var customForm = {
     undoAutocompleteSelection: function() {
         
         this.acSelectorWrapper.show();
-        this.acSelector.attr('disabled', '');
-        this.acSelector.val('');
         this.hideFields(this.acSelection);
+        this.acSelector.val('');
         this.acUriReceiver.val('');
-        this.acLabelReceiver.val('');
         this.acSelectionInfo.html('');
         this.verifyMatch.attr('href', this.verifyMatchBaseHref);