Changeset 7286

Timestamp:

Jan 31, 2017, 9:49:32 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2050: Add subtype and node columns to job item

The filter for subtype column in the list view should have a 'none' option.

File:

• branches/3.10-stable/www/views/jobs/list_jobs.jsp (modified) (2 diffs)

branches/3.10-stable/www/views/jobs/list_jobs.jsp

@@ -196 +196 @@
         exportable="true"
       />
-      <%
-      Enumeration<String, String> jobTypes = new Enumeration<String, String>();
-      for (ItemSubtype subtype : typeQuery.list(dc))
-      {
-        jobTypes.add(Integer.toString(subtype.getId()), HTML.encodeTags(subtype.getName()));
-      }
-      %>    
       <tbl:columndef 
         id="itemSubtype"
@@ -209 +202 @@
         exportproperty="itemSubtype.name:string"
         datatype="int"
-        enumeration="<%=jobTypes%>"
+        enumeration="<%=Enumeration.fromItems(typeQuery.list(dc), "-none-")%>"
         title="Subtype"
         sortable="true"