0409f25c99f720520e4fb83ef43847eca6647119
galt
Wed May 23 13:45:55 2018 -0700
CIRM Fixed cdwFile_filter and fullText search. Switches dynamically between facets and tags tables as needed.
diff --git src/hg/lib/tablesTables.c src/hg/lib/tablesTables.c
index 5375c02..bc5b789 100644
--- src/hg/lib/tablesTables.c
+++ src/hg/lib/tablesTables.c
@@ -68,35 +68,38 @@
static void showTableFilterInstructionsEtc(struct fieldedTable *table,
char *itemPlural, struct fieldedTableSegment *largerContext, void (*addFunc)(void),
char *visibleFacetList)
/* Print instructional text, and basic summary info on who passes filter, and a submit
* button just in case user needs it */
{
/* Print info on matching */
int matchCount = slCount(table->rowList);
if (largerContext != NULL) // Need to page?
matchCount = largerContext->tableSize;
cgiMakeButton("submit", "search");
printf("  ");
+
cgiMakeOnClickButton("clearButton",
"$(':input').not(':button, :submit, :reset, :hidden, :checkbox, :radio').val('');\n"
"$('[name=cdwBrowseFiles_page]').val('1');\n"
-"$('#submit').click();\n"
-, "clear search");
+"$('[name=clearSearch]').val('1');\n"
+"$('#submit').click();\n",
+"clear search");
+
printf("
");
printf("%d %s found. ", matchCount, itemPlural);
if (addFunc)
addFunc();
if (!visibleFacetList)
{
printf("
\n");
printf("You can further filter search results field by field below. ");
printf("Wildcard * and ? characters are allowed in text fields. ");
printf(">min or <max are allowed in numerical fields.
\n");
}
}