556cfb231a133fd54449867c2a3e88e1d775ce9d kate Thu Jun 26 13:25:46 2014 -0700 Suppress spurious 'Minimum' prefix to UI filter box label when using a range filter. refs #13230 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index db15e14..70f1459 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -5200,32 +5200,38 @@ isFloat = (extra->type == ftFloat); } } #else///ifndef EXTRA_FIELDS_SUPPORT if (as != NULL) { struct asColumn *asCol = asColumnFind(as, field); if (asCol != NULL) { // Found label so replace field field = asCol->comment; if (!isFloat) isFloat = asTypesIsFloating(asCol->lowType->type); } } #endif///ndef EXTRA_FIELDS_SUPPORT + // FIXME: Label munging should be localized to showScoreFilter() + // when that function is simplified + char varName[256]; char label[128]; - safef(label,sizeof(label),"Minimum %s",field); + safef(varName, sizeof(varName), "%s%s", scoreName, _BY_RANGE); + boolean filterByRange = trackDbSettingClosestToHomeOn(tdb, varName); + safef(label, sizeof(label),"%s%s", filterByRange ? "": "Minimum ", field); + showScoreFilter(cart,tdb,opened,boxed,parentLevel,name,title,label,scoreName,isFloat); freeMem(scoreName); count++; } slNameFree(&filter); } #ifdef EXTRA_FIELDS_SUPPORT if (extras != NULL) extraFieldsFree(&extras); #else///ifndef EXTRA_FIELDS_SUPPORT if (as != NULL) asObjectFree(&as); #endif///ndef EXTRA_FIELDS_SUPPORT } if (count > 0)