Changeset 6966

Timestamp:

Oct 2, 2015, 10:41:56 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #950: Add support for any-to-any link filters in table lists views

The changes made to filter definitions in [6934] broke some queries used in the Trashcan and Project class. We need the filters with generic names as well as the filters with item-specific names.

File:

• trunk/src/core/net/sf/basedb/core/HibernateUtil.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -547 +547 @@
     if (filterSource == null) return;
 
-    // Define the filter by cloning the template onto the
-    // root element and set the name including the item type.
+    // Define the filter by cloning the template onto the root element
+    classTag.getDocument().getRootElement().addContent(filterSource.clone());
+    // We also need the same filter with name+itemtype so we have control
+    // for each type of item
     Element filterDef = filterSource.clone();
     filterDef.setAttribute("name", name + itemType.name());
     classTag.getDocument().getRootElement().addContent(filterDef);
 
-    // Second part of the filter definition goes inside the
-    // class tag
-    Element element = new Element("filter");
-    element.setAttribute("name", name + itemType.name());
-    element.setAttribute("condition", condition);
-    classTag.addContent(element);
-    
+    // Second part of the filter definition goes inside the class tag
+    Element filter = new Element("filter");
+    filter.setAttribute("name", name);
+    filter.setAttribute("condition", condition);
+    classTag.addContent(filter);
+    
+    // And the name+itemtype variant
+    filter = new Element("filter");
+    filter.setAttribute("name", name + itemType.name());
+    filter.setAttribute("condition", condition);
+    classTag.addContent(filter);
   }