Changeset 7037 for trunk/www/views/items/list_items.jsp

Timestamp:

Dec 4, 2015, 12:55:19 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #1976: Improve filtering in "All items" list

The list now uses conditional query elements.

File:

• trunk/www/views/items/list_items.jsp (modified) (2 diffs)

trunk/www/views/items/list_items.jsp

@@ -44 +44 @@
   import="net.sf.basedb.core.query.Restriction"
   import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.ReturnClassFilter"
   import="net.sf.basedb.util.Enumeration"
   import="net.sf.basedb.util.ShareableUtil"
@@ -98 +99 @@
       }
     }
-    Restriction sharedTo = cc.getFilterRestriction("!sharedTo.name", dc, null);
-    Restriction name = cc.getFilterRestriction("name", dc, null);
-    Restriction description = cc.getFilterRestriction("description", dc, null);
     Restriction id = cc.getFilterRestriction("id", dc, null);
+    Restriction sharedTo = Restrictions.conditionalRestriction(new ReturnClassFilter(Shareable.class),
+      cc.getFilterRestriction("!sharedTo.name", dc, null), null, true);
+    Restriction name = Restrictions.conditionalRestriction(new ReturnClassFilter(Nameable.class),
+      cc.getFilterRestriction("name", dc, null), null, true);
+    Restriction description = Restrictions.conditionalRestriction(new ReturnClassFilter(Nameable.class),
+      cc.getFilterRestriction("description", dc, null), null, true);
     Restriction restriction = Restrictions.nullSafeAnd(sharedTo, name, description, id);
-    if (sharedTo != null) 
-    {
-      // If we filter on "Shared to" we must make sure to only 
-      // include Shareable items in the query
-      if (itemTypes != null)
-      {
-        itemTypes.retainAll(Metadata.getShareableItems());
-      }
-      else
-      {
-        itemTypes = Metadata.getShareableItems();
-      }
-    }
+
     User loggedInUser = User.getById(dc, sc.getLoggedInUserId());
     if (itemTypes == null || itemTypes.size() > 0)