Changeset 6722 for branches/3.4-stable/www/common/annotations/list_annotations.jsp

Timestamp:

Feb 11, 2015, 1:57:10 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1919: The primary annotations list may not contain all annotation in category

File:

• branches/3.4-stable/www/common/annotations/list_annotations.jsp (modified) (2 diffs)

branches/3.4-stable/www/common/annotations/list_annotations.jsp

@@ -42 +42 @@
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultList"
+  import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.query.Orders"
@@ -169 +170 @@
   {
     ItemQuery<AnnotationType> query = AnnotationType.getQuery(item.getType());
+    query.setIncludes(Include.ALL);
     query.join(Hql.innerJoin("categories", "ct"));
     query.restrict(Restrictions.eq(Hql.property("ct", "name"), Expressions.string(selectedCategoryName)));