Changeset 7798 for branches/3.16-stable/www/biomaterials/biosources/list_biosources.jsp

Timestamp:

Apr 9, 2020, 11:50:31 AM (2 years ago)

Author:

Nicklas Nordborg

Message:

References #2206: Display information about item list membership

Fixed in the biosource list page and single-item page.

File:

• branches/3.16-stable/www/biomaterials/biosources/list_biosources.jsp (modified) (6 diffs)

branches/3.16-stable/www/biomaterials/biosources/list_biosources.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.ItemResultList"
   import="net.sf.basedb.core.ItemContext"
+  import="net.sf.basedb.core.ItemList"
   import="net.sf.basedb.core.Nameable"
   import="net.sf.basedb.core.Permission"
@@ -61 +62 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.formatter.Formatter"
+  import="net.sf.basedb.util.formatter.NameableFormatter"
+  import="net.sf.basedb.clients.web.formatter.LinkedItemFormatter"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
@@ -92 +95 @@
 
 final ModeInfo mode = ModeInfo.get(request.getParameter("mode"));
+final Formatter<Nameable> nameableFormatter = mode.hasPropertyLink() ? new LinkedItemFormatter(mode.hasEditLink()) : new NameableFormatter();
 final String callback = request.getParameter("callback");
 final String title = mode.generateTitle("biosource", "biosources");
@@ -109 +113 @@
 
   final ItemQuery<Sample> sampleQuery = Sample.getQuery();
-  sampleQuery.include(cc.getInclude());
+  sampleQuery.setIncludes(cc.getInclude());
   sampleQuery.restrict(Restrictions.eq(Hql.property("parent"), Expressions.parameter("bioSource")));
   sampleQuery.order(Orders.asc(Hql.property("name")));
   final boolean createSamplePermission = sc.hasPermission(Permission.CREATE, Item.SAMPLE);
 
+  final ItemQuery<ItemList> listQuery = ItemList.getQuery();
+  listQuery.setIncludes(cc.getInclude());
+  listQuery.join(Hql.innerJoin("members", "m"));
+  listQuery.restrict(Restrictions.eq(Hql.property("memberType"), Expressions.integer(itemType.getValue())));
+  listQuery.restrict(Restrictions.eq(Hql.alias("m"), Expressions.parameter("itemId", Type.INT)));
+  listQuery.order(Orders.asc(Hql.property("name")));
+  
   Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
   try
@@ -521 +532 @@
                   /></tbl:cell>
                 <tbl:cell column="externalId"><%=HTML.encodeTags(item.getExternalId())%></tbl:cell>
+                <tbl:cell column="itemList">
+                  <%
+                  listQuery.setParameter("itemId", itemId, Type.INT);
+                  %>
+                  <%=Values.getString(listQuery.list(dc), ", ", false, nameableFormatter) %>
+                </tbl:cell>
                 <tbl:cell column="samples">
                   <%
                   sampleQuery.setParameter("bioSource", itemId, Type.INT);
-                  try
-                  {
-                    String separator = "";
-                    for (Sample s : sampleQuery.list(dc))
-                    {
-                      out.write(separator);
-                      if (mode.hasPropertyLink())
-                      {
-                        out.write(Base.getLinkedName(ID, s, false, mode.hasEditLink()));
-                      }
-                      else
-                      {
-                        out.write(HTML.encodeTags(s.getName()));
-                      }
-                      separator = ", ";
-                    }
-                  }
-                  catch (Throwable t)
-                  {
-                    %>
-                    <div class="error"><%=t.getMessage()%></div>
-                    <%
-                  }
                   %>
+                  <%=Values.getString(sampleQuery.list(dc), ", ", false, nameableFormatter) %>
                   <base:icon
                     id="<%="newsample."+itemId%>"
@@ -592 +587 @@
                 <tbl:cell column="permission"><%=PermissionUtil.getShortPermissions(item)%></tbl:cell>
                 <tbl:cell column="sharedTo">
-                  <%
-                  Iterator<Nameable> sharees = ShareableUtil.getSharedTo(dc, item).iterator();
-                  while(sharees.hasNext())
-                  {
-                    Nameable n = sharees.next();
-                    if (mode.hasPropertyLink())
-                    {
-                      out.write(Base.getLinkedName(ID, n, false, mode.hasEditLink()));
-                    }
-                    else
-                    {
-                      out.write(HTML.encodeTags(n.getName()));
-                    }
-                    out.write(sharees.hasNext() ? ", " : "");
-                  }
-                  %>
+                  <%=Values.getString(ShareableUtil.getSharedTo(dc, item), ", ", false, nameableFormatter) %>
                 </tbl:cell>
                 <tbl:xt-cells dc="<%=dc%>" item="<%=item%>">