Changeset 4172

Timestamp:

Mar 12, 2008, 11:49:03 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #946: Job agents list view don't display running jobs

File:

• branches/2.6-stable/www/admin/jobagents/list_agents.jsp (modified) (3 diffs)

branches/2.6-stable/www/admin/jobagents/list_agents.jsp

@@ -49 +49 @@
   import="net.sf.basedb.util.Enumeration"
   import="net.sf.basedb.util.ShareableUtil"
+  import="net.sf.basedb.util.jobagent.JobInfo"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.PermissionUtil"
@@ -499 +500 @@
                 <tbl:cell column="jobs">
                   <%
-                  Set<Integer> jobs = item.getInfo().getJobs();
-                  if (jobs == null || jobs.size() == 0)
+                  Set<JobInfo> jobs = item.getInfo().getJobInfo();
+                  if (jobs == null)
+                  {
+                    %>
+                    Unknown
+                    <%
+                  }
+                  else if (jobs.size() == 0)
                   {
                     %>
@@ -509 +516 @@
                   {
                     String separator = "";
-                    for (int jobId : jobs)
+                    for (JobInfo jobInfo : jobs)
                     {
                       try
                       {
-                        Job job = Job.getById(dc, jobId);
+                        Job job = Job.getById(dc, jobInfo.getJobId());
                         out.write(separator);
                         if (mode.hasPropertyLink())