37a52238c2d5b566f9725336e9a445ee7ebd3e59 tdreszer Thu Nov 10 09:18:43 2011 -0800 Fixed newly introduced filterBy bug. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 19f140d..1f4d6d0 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -3482,35 +3482,35 @@ jsIncludeFile("ddcl.js",NULL); #endif///def NEW_JQUERY int ix=0; for(filterBy = filterBySet;filterBy != NULL; filterBy = filterBy->next) { puts("<TD>"); if(count == 1) printf("<B>Filter by %s</B> (select multiple items - %s)",filterBy->title,FILTERBY_HELP_LINK); else printf("<B>%s</B>",filterBy->title); printf("<BR>\n"); // TODO: columnCount (Number of filterBoxes per row) should be configurable through tdb setting #ifdef NEW_JQUERY - #define FILTER_BY_FORMAT "<SELECT id='fbc%d' name='%s.filterBy.%s' multiple style='display: none; font-size:.9em;' class='filterBy'><BR>\n" + #define FILTER_BY_FORMAT "<SELECT id='fbc%d' name='%s' multiple style='display: none; font-size:.9em;' class='filterBy'><BR>\n" #else///ifndef NEW_JQUERY - #define FILTER_BY_FORMAT "<SELECT id='fbc%d' name='%s.filterBy.%s' multiple style='display: none;' class='filterBy'><BR>\n" + #define FILTER_BY_FORMAT "<SELECT id='fbc%d' name='%s' multiple style='display: none;' class='filterBy'><BR>\n" #endif///ndef NEW_JQUERY - printf(FILTER_BY_FORMAT,ix,tdb->track,filterBy->column); + printf(FILTER_BY_FORMAT,ix,filterBy->htmlName); ix++; printf("<OPTION%s>All</OPTION>\n",(filterBy->slChoices == NULL || slNameInList(filterBy->slChoices,"All")?" SELECTED":"")); struct slName *slValue; int ix=1; for(slValue=filterBy->slValues;slValue!=NULL;slValue=slValue->next,ix++) { char varName[32]; char *label = NULL; char *name = NULL; if (filterBy->useIndex) { safef(varName, sizeof(varName), "%d",ix); name = varName; label = slValue->name;