Changeset 7782

Timestamp:

Feb 28, 2020, 3:28:02 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2202: Include information from parent items in list pages

When a parent item column with a filter is hidden the filter must be removed, since it is not possible to get information about this hidden filter which may confuse the user.

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -649 +649 @@
         }
         
+        String allColumns = cc.getSetting("columns");
+        Set<String> visibleParentCols = new HashSet<>();
+        if (allColumns != null)
+        {
+          for (String col : allColumns.split(","))
+          {
+            if (col.startsWith("/")) visibleParentCols.add(col);
+          }
+        }
+
         while (names.hasMoreElements())
         {
@@ -667 +677 @@
               property = property.substring(0, split);
             }
+            if (property.startsWith("/") && value != null)
+            {
+              // If the filter is on a parent item and the column is no
+              // longer visible, we need to remove the filter, since it
+              // will get very confusing otherwise
+              // There are some variants when column is the name of a parent item
+              boolean isOkFilter = visibleParentCols.contains(property)
+                || visibleParentCols.contains(property.replace("/name", "/."))
+                || visibleParentCols.contains(property.replace(".name", ""));
+              if (!isOkFilter) value = null;
+            } 
             if (value != null)
             {