litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r5462 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-24 18:08:45 +00:00
parent 5671656d5d
commit 92d83f4ac2
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
View file

@ -56,14 +56,9 @@ import freemarker.template.Configuration;
/** /**
* AutocompleteController is used to generate autocomplete and select element content * 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{ public class AutocompleteController extends FreeMarkerHttpServlet implements Searcher{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

1
webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
View file

@ -448,6 +448,7 @@ public class InputElementFormattingTag extends TagSupport {
out.print("<input "+classStr+" "+sizeStr+" type=\"text\" id=\""+getId()+"\" name=\""+getName()+"\" value=\""+valueStr+"\" />"); out.print("<input "+classStr+" "+sizeStr+" type=\"text\" id=\""+getId()+"\" name=\""+getName()+"\" value=\""+valueStr+"\" />");
if (definitionTags) { out.print("</dd>"); } if (definitionTags) { out.print("</dd>"); }
out.println(); out.println();
// Handle hidden inputs where Javascript writes a value that needs to be returned with an invalid submission.
} else if( getType().equalsIgnoreCase("hidden")) { } else if( getType().equalsIgnoreCase("hidden")) {
String valueStr = doValue(editConfig, editSub); String valueStr = doValue(editConfig, editSub);
if (definitionTags) { out.print("<dd>"); } if (definitionTags) { out.print("<dd>"); }