Changeset 7038

Timestamp:

Dec 4, 2015, 1:00:05 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

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

Location:

trunk

Files:

• src/core/net/sf/basedb/core/User.java (modified) (1 diff)
• www/views/items/list_items.jsp (modified) (4 diffs)

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

@@ -43 +43 @@
 import net.sf.basedb.core.query.Expressions;
 import net.sf.basedb.core.query.ResultList;
-import net.sf.basedb.core.query.Selects;
 
 import java.util.ArrayList;

trunk/www/views/items/list_items.jsp

@@ -37 +37 @@
   import="net.sf.basedb.core.Shareable"
   import="net.sf.basedb.core.SharedItem"
+  import="net.sf.basedb.core.Subtypable"
   import="net.sf.basedb.core.File"
   import="net.sf.basedb.core.Directory"
@@ -106 +107 @@
     Restriction description = Restrictions.conditionalRestriction(new ReturnClassFilter(Nameable.class),
       cc.getFilterRestriction("description", dc, null), null, true);
-    Restriction restriction = Restrictions.nullSafeAnd(sharedTo, name, description, id);
+    Restriction subtype = Restrictions.conditionalRestriction(new ReturnClassFilter(Subtypable.class),
+      cc.getFilterRestriction("itemSubtype.name", dc, null), null, true);
+    Restriction restriction = Restrictions.nullSafeAnd(sharedTo, name, description, id, subtype);
 
     User loggedInUser = User.getById(dc, sc.getLoggedInUserId());
@@ -168 +171 @@
         datatype="int"
         title="ID"
+        filterable="true"
+      />
+      <tbl:columndef
+        id="itemSubtype"
+        property="itemSubtype.name"
+        datatype="string"
+        title="Subtype"
         filterable="true"
       />
@@ -353 +363 @@
                 <tbl:cell column="name"><%=link%></tbl:cell>
                 <tbl:cell column="id"><%=item.getId()%></tbl:cell>
+                <tbl:cell column="itemSubtype"><%
+                if (item instanceof Subtypable)
+                {
+                  %><base:propertyvalue item="<%=item%>" property="itemSubtype" /><%
+                }
+                %></tbl:cell>
                 <tbl:cell column="description"><%=HTML.encodeTags(description)%></tbl:cell>
                 <tbl:cell column="sharedTo">