diff --git a/api/src/org/labkey/api/data/JsonWriter.java b/api/src/org/labkey/api/data/JsonWriter.java index 4280839b1fb..be24261e652 100644 --- a/api/src/org/labkey/api/data/JsonWriter.java +++ b/api/src/org/labkey/api/data/JsonWriter.java @@ -251,12 +251,13 @@ else if (cinfo.getJdbcType().isNumeric()) props.put("shortCaption", cinfo.getShortLabel()); - if (dc instanceof IMultiValuedDisplayColumn || (cinfo.getParentTable() != null && cinfo.getParentTable().getSqlDialect() != null && !cinfo.getParentTable().getSqlDialect().isSortableDataType(cinfo.getSqlTypeName()))) + if (PropertyType.FILE_LINK == cinfo.getPropertyType() || dc instanceof IMultiValuedDisplayColumn || (cinfo.getParentTable() != null && cinfo.getParentTable().getSqlDialect() != null && !cinfo.getParentTable().getSqlDialect().isSortableDataType(cinfo.getSqlTypeName()))) { + // Disallow faceted filtering for file columns since the values are often absolute file path + // Disallow faceted filtering when the column is multi-valued, as the value that comes out of the // database likely has a different delimiter compared to what the user wants to see and therefore // doesn't work very well. - // Similarly, SQLServer doesn't allow doing a SELECT DISTINCT on TEXT columns, so check the data type (they also can't be sorted) props.put("facetingBehaviorType", FacetingBehaviorType.ALWAYS_OFF); } diff --git a/api/src/org/labkey/api/study/assay/FileLinkDisplayColumn.java b/api/src/org/labkey/api/study/assay/FileLinkDisplayColumn.java index 970fa700288..bccdb82539c 100644 --- a/api/src/org/labkey/api/study/assay/FileLinkDisplayColumn.java +++ b/api/src/org/labkey/api/study/assay/FileLinkDisplayColumn.java @@ -463,15 +463,4 @@ public Object getExportCompatibleValue(RenderContext ctx) return getJsonValue(ctx); } - @Override - public boolean isFilterable() - { - return false; - } - @Override - public boolean isSortable() - { - return false; - } - }