Changeset 8103

Timestamp:

Jan 18, 2023, 2:38:24 PM (8 months ago)

Author:

Nicklas Nordborg

Message:

Fixes #2292: The function for displaying hidden columns with a filter doesn't always work

I think it should work now. Since we only know the filter properties to begin with we need to swap properties with column ids when we learn if a filtered column is visible or not.

Location:

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/taglib/table

Files:

• ColumnDef.java (modified) (1 diff)
• PresetSelector.java (modified) (1 diff)
• Table.java (modified) (1 diff)

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/taglib/table/ColumnDef.java

@@ -935 +935 @@
       if (isFilterable && hasFilter) 
       {
-        table.addFilteredColumn(getFilterproperty(), isVisible);
+        table.addFilteredColumn(getId(), getFilterproperty(), isVisible);
       }
     }

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/taglib/table/PresetSelector.java

@@ -319 +319 @@
               if (value.startsWith("/"))
               {
-                if (value.endsWith("/name") || value.endsWith(".name"))
+                if (value.endsWith("/name"))
                 {
                   value = value.replace("/name", "/.");

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/taglib/table/Table.java

@@ -565 +565 @@
     columnFilter.put(columnId+"@"+row, filterHtml);
   }
-  void addFilteredColumn(String columnId, boolean visible)
+  void addFilteredColumn(String columnId, String filterProperty, boolean visible)
   {
     numFilteredColumns++;
-    if (visible) hiddenFilteredColumns.remove(columnId);
+    // Swap the filter property with column id if needed
+    hiddenFilteredColumns.remove(filterProperty);
+    if (!visible) hiddenFilteredColumns.add(columnId);
   }
   Set<String> getHiddenFilteredColumns()