Changeset 7311 for trunk/www/admin/datafiletypes/list_filetypes.jsp

Timestamp:

Mar 21, 2017, 9:09:35 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2066: Display item subtypes that are referencing a data file type

Also added a column in the list page.

File:

• trunk/www/admin/datafiletypes/list_filetypes.jsp (modified) (4 diffs)

trunk/www/admin/datafiletypes/list_filetypes.jsp

@@ -33 +33 @@
   import="net.sf.basedb.core.PlatformVariant"
   import="net.sf.basedb.core.PlatformFileType"
+  import="net.sf.basedb.core.ItemSubtypeFileType"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.Include"
@@ -101 +102 @@
   platformQuery.restrict(Restrictions.eq(Hql.property("dataFileType"), Expressions.parameter("fileType")));
   platformQuery.order(Orders.asc(Hql.property("platform.name"))); 
+
+  // Query to get the item subtypes a file type is registerd with
+  final ItemQuery<ItemSubtypeFileType> subtypeQuery = ItemSubtypeFileType.getQuery((DataFileType)null);
+  subtypeQuery.include(cc.getInclude());
+  subtypeQuery.restrict(Restrictions.eq(Hql.property("dataFileType"), Expressions.parameter("fileType")));
+  subtypeQuery.order(Orders.asc(Hql.property("itemSubtype.name"))); 
   
   // Get all file types
@@ -221 +228 @@
         title="Platforms"
         property="&platforms(platform.name)"
+        datatype="string"
+        filterable="true"
+      />
+      <tbl:columndef
+        id="subtypes"
+        title="Subtypes"
+        property="&itemSubtypes(itemSubtype.name)"
         datatype="string"
         filterable="true"
@@ -466 +480 @@
                   %>
                 </tbl:cell>
+                <tbl:cell column="subtypes">
+                  <%
+                  subtypeQuery.setParameter("fileType", itemId, Type.INT);
+                  try
+                  {
+                    String separator = "";
+                    for (ItemSubtypeFileType st : subtypeQuery.list(dc))
+                    {
+                      ItemSubtype s = st.getItemSubtype();
+                      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>
+                    <%
+                  }
+                  %>
+                </tbl:cell>
                 <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
                 <tbl:xt-cells dc="<%=dc%>" item="<%=item%>">