From 92d83f4ac2c662f281da22b656720fa9d7695fd1 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Sat, 24 Jul 2010 18:08:45 +0000
Subject: [PATCH] Merge r5462 from
 http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

---
 .../webapp/search/controller/AutocompleteController.java   | 7 +------
 .../webapp/web/jsptags/InputElementFormattingTag.java      | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
index 730ad4a8c..edb1ca313 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
@@ -56,14 +56,9 @@ import freemarker.template.Configuration;
 
 /**
  * AutocompleteController is used to generate autocomplete and select element content
- * through a Lucene search. The search logic is copied from AutocompleteController.
+ * through a Lucene search. 
  */
 
-/* rjy7 We should have a SearchController that is subclassed by both AutocompleteController 
- * and AjaxSearchController, so the methods don't all have to be copied into both places.
- * The parent SearchController should extend FreeMarkerHttpServlet. Can only be done
- * once AutocompleteController has been moved to FreeMarker.
- */
 public class AutocompleteController extends FreeMarkerHttpServlet implements Searcher{
 
     private static final long serialVersionUID = 1L;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
index bfeb39481..504970694 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
@@ -448,6 +448,7 @@ public class InputElementFormattingTag extends TagSupport {
                 out.print("<input "+classStr+" "+sizeStr+" type=\"text\" id=\""+getId()+"\" name=\""+getName()+"\" value=\""+valueStr+"\" />");
                 if (definitionTags) { out.print("</dd>"); }
                 out.println();
+            // Handle hidden inputs where Javascript writes a value that needs to be returned with an invalid submission.
             } else if( getType().equalsIgnoreCase("hidden")) {
                 String valueStr = doValue(editConfig, editSub);
                 if (definitionTags) { out.print("<dd>"); }