Changeset 7782
- Timestamp:
- Feb 28, 2020, 3:28:02 PM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/clients/web/net/sf/basedb/clients/web/Base.java
r7761 r7782 649 649 } 650 650 651 String allColumns = cc.getSetting("columns"); 652 Set<String> visibleParentCols = new HashSet<>(); 653 if (allColumns != null) 654 { 655 for (String col : allColumns.split(",")) 656 { 657 if (col.startsWith("/")) visibleParentCols.add(col); 658 } 659 } 660 651 661 while (names.hasMoreElements()) 652 662 { … … 667 677 property = property.substring(0, split); 668 678 } 679 if (property.startsWith("/") && value != null) 680 { 681 // If the filter is on a parent item and the column is no 682 // longer visible, we need to remove the filter, since it 683 // will get very confusing otherwise 684 // There are some variants when column is the name of a parent item 685 boolean isOkFilter = visibleParentCols.contains(property) 686 || visibleParentCols.contains(property.replace("/name", "/.")) 687 || visibleParentCols.contains(property.replace(".name", "")); 688 if (!isOkFilter) value = null; 689 } 669 690 if (value != null) 670 691 {
Note: See TracChangeset
for help on using the changeset viewer.