From dccd622b5b18ce9435dc6b43efdc5665cef71145 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sun, 4 Jul 2010 01:12:59 +0000
Subject: [PATCH] NIHVIVO-646 After removing an author, reset autocomplete url
 to modify excluded uris so that uri of author just removed is no longer
 excluded.

---
 .../js/addAuthorsToInformationResource.js     | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/productMods/edit/forms/js/addAuthorsToInformationResource.js b/productMods/edit/forms/js/addAuthorsToInformationResource.js
index 70373397..d574e63e 100644
--- a/productMods/edit/forms/js/addAuthorsToInformationResource.js
+++ b/productMods/edit/forms/js/addAuthorsToInformationResource.js
@@ -139,8 +139,11 @@ var addAuthorForm = {
         					if ($('.authorship').length == 1) {
         						addAuthorForm.disableAuthorDD();
         					}
+        					// Reset the excluded uris in the autocomplete url so that the
+        					// author just removed is no longer excluded.
+        					$('#lastName').autocomplete('option', 'source', addAuthorForm.getAcUrl());
     					});
-	
+
 //    					$(this).hide();
 //    					$(this).siblings('.undo').show();
 //    					author.html(authorName + ' has been removed');
@@ -434,22 +437,17 @@ var addAuthorForm = {
     
     initAutocomplete: function() {
 
-    	var cache = {};
-    	var url = $('.acUrl').attr('id');
-    	var existingAuthorUris = addAuthorForm.getExistingAuthorUris();
-
-    	jQuery.each(existingAuthorUris, function(index, element) {
-    		url += '&excludeUri=' + element;
-    	});
+    	//var cache = {};
+    	// RY change to this.cache = {}
+    	// then we'll have access to it when removing an author
     	
     	$('#lastName').autocomplete({
     		minLength: 2,
-    		source: url,
+    		source: addAuthorForm.getAcUrl(),
 // RY For now, not using cache because there are complex interactions between filtering and caching.
 // We want to filter out existingAuthors from autocomplete results, and this seems easiest to do
 // server-side. But if an author gets removed, we need to put them back in the results. If results
-// are cached, the cache needs to be cleared on a remove. Not sure if we have access to it there.
-// Lots of complexity involved, so for now let's try without the cache.
+// are cached, the cache needs to be cleared on a remove. 
 //    		source: function(request, response) {
 //    			if (request.term in cache) {
 //    				//console.log("found term in cache");
@@ -477,14 +475,15 @@ var addAuthorForm = {
 
     },
     
-    getExistingAuthorUris: function() {
-    	// NB This only gets the id of the first one
-    	// return $('#authorships .authorLink').attr('id');
-    	var existingAuthors = $('#authorships .authorLink'); 
-    	return existingAuthors.map(function() {
-    		return $(this).attr('id');
+    getAcUrl: function() {
+    	var url = $('.acUrl').attr('id'),
+    		existingAuthors = $('#authorships .authorLink'); 
+    	
+    	existingAuthors.each(function() {
+    		url += '&excludeUri=' + $(this).attr('id');
     	});
     	
+    	return url;
     },
     
     prepareSubmit: function() {