Changeset 7311

Timestamp:

Mar 21, 2017, 9:09:35 AM (5 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.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/ItemSubtypeFileType.java (modified) (1 diff)
• www/admin/datafiletypes/list_filetypes.jsp (modified) (4 diffs)
• www/admin/datafiletypes/view_filetype.jsp (modified) (2 diffs)

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

@@ -113 +113 @@
   
   /**
+    Get the item subtype types that have been registered for a specific data
+    file type.
+    
+    @param fileType An data file type or null to return items for
+      all file types
+    @return A query returning <code>ItemSubtypeFileType</code> items
+    @since 3.11
+  */
+  public static ItemQuery<ItemSubtypeFileType> getQuery(DataFileType fileType)
+  {
+    ItemQuery<ItemSubtypeFileType> query = 
+      new ItemQuery<ItemSubtypeFileType>(ItemSubtypeFileType.class, RUNTIME_FILTER);
+    if (fileType != null)
+    {
+      query.restrictPermanent(
+        Restrictions.eq(
+          Hql.property("dataFileType"),
+          Hql.entity(fileType)
+        )
+      );
+    }
+    return query;
+  }
+
+  /**
     Creates a new member item from the given data.
     @param data the data.

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%>">

trunk/www/admin/datafiletypes/view_filetype.jsp

@@ -34 +34 @@
   import="net.sf.basedb.core.PlatformVariant"
   import="net.sf.basedb.core.PlatformFileType"
+  import="net.sf.basedb.core.ItemSubtypeFileType"
+  import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.ItemQuery"
@@ -296 +298 @@
         %>
       </base:section>
+      <%
+      ItemQuery<ItemSubtypeFileType> subtypeQuery = ItemSubtypeFileType.getQuery(fileType);
+      subtypeQuery.include(Include.ALL);
+      subtypeQuery.order(Orders.asc(Hql.property("itemSubtype.name")));
+      ItemResultList<ItemSubtypeFileType> subtypes = subtypeQuery.list(dc);
+      %>
+      <base:section 
+        id="subtypes"
+        title="<%="Used by item subtypes (" + subtypes.size() + ")"%>"
+        context="<%=cc%>"
+        >
+        <%
+        if (subtypes.size() == 0)
+        {
+          %>
+          <div class="messagecontainer note">
+          This file type is not used by any item subtypes
+          (or, you don't have permission to view them).
+          </div>
+          <%
+        }
+        else
+        {
+          %>
+          <tbl:table
+            id="tbl.subtypes"
+            columns="all"
+            >
+            <tbl:columndef 
+              id="subtype"
+              title="Item subtype"
+            />
+            <tbl:columndef 
+              id="required"
+              title="Required"
+            />
+            <tbl:columndef 
+              id="multiple"
+              title="Multiple files"
+            />
+            <tbl:data>
+              <tbl:headers>
+                <tbl:headerrow>
+                  <tbl:columnheaders />
+                </tbl:headerrow>
+              </tbl:headers>
+              <tbl:rows>
+              <%
+              for (ItemSubtypeFileType item : subtypes)
+              {
+                ItemSubtype st = item.getItemSubtype();
+                %>
+                <tbl:row>
+                  <tbl:cell column="subtype"><base:icon 
+                      image="deleted.png" 
+                      tooltip="This item has been scheduled for deletion" 
+                      visible="<%=st.isRemoved()%>"
+                    /><%=Base.getLinkedName(ID, st, false, true)%></tbl:cell>
+                  <tbl:cell column="required"><%=item.isRequired() ? "yes" : "no"%></tbl:cell>
+                  <tbl:cell column="multiple"><%=item.getAllowMultiple() ? "yes" : "no"%></tbl:cell>
+                </tbl:row>
+                <%
+              }
+              %>
+              </tbl:rows>
+            </tbl:data>
+          </tbl:table>
+          <%
+        }
+        %>
+      </base:section>
       <jsp:include page="../../common/anytoany/list_anytoany.jsp">
         <jsp:param name="ID" value="<%=ID%>" />