Changeset 6581

Timestamp:

Oct 29, 2014, 10:49:23 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1875: Abort multiple jobs

Location:

branches/3.3-stable/www/views/jobs

Files:

• index.jsp (modified) (2 diffs)
• jobs.js (modified) (2 diffs)
• list_jobs.jsp (modified) (1 diff)

branches/3.3-stable/www/views/jobs/index.jsp

@@ -58 +58 @@
   import="java.util.List"
   import="java.util.ArrayList"
+  import="java.util.Collection"
   import="java.util.Collections"
 %>
@@ -278 +279 @@
     redirect = viewPage;
   }
+  else if ("AbortJobs".equals(cmd))
+  {
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    dc = sc.newDbControl();
+    int numAborted = 0;
+    int numSelected = 0;
+    for (int jobId : cc.getSelected())
+    {
+      numSelected++;
+      Job job = Job.getById(dc, jobId);
+      SignalTransporter signalTransporter = job.getSignalTransporter();
+      if (signalTransporter == null)
+      {
+        if (job.getStatus() == Job.Status.WAITING)
+        {
+          job.doneError("Aborted by user");
+          numAborted++;
+        }
+      }
+      else
+      {
+        Collection<Signal> supportedSignals = signalTransporter.getSupportedSignals();
+        if (supportedSignals == null || supportedSignals.contains(Signal.ABORT))
+        {
+          signalTransporter.send(Signal.ABORT);
+          numAborted++;
+        }
+      }
+    }
+    dc.commit();
+    
+    message = numAborted + " of " + numSelected + " jobs have been aborted ";
+    Thread.sleep(500);
+    redirect = listPage;
+  }
   else if ("AbortJob".equals(cmd))
   {

branches/3.3-stable/www/views/jobs/jobs.js

@@ -62 +62 @@
       Buttons.addClickHandler('btnDeleteItems', Buttons.deleteItems, tableAttributes);
       Buttons.addClickHandler('btnRestoreItems', Buttons.restoreItems, tableAttributes);
+      Buttons.addClickHandler('btnAbort', jobs.abortJobs, tableAttributes);
       Buttons.addClickHandler('btnShareItems', Buttons.shareItems, tableAttributes);
       Buttons.addClickHandler('btnSetOwner', Buttons.setOwnerOfItems, tableAttributes);
@@ -80 +81 @@
   }
 
+  
+  jobs.abortJobs = function()
+  {
+    var frm = document.forms['jobs'];
+    var numSelected = Table.checkIfSelected('jobs');
+    if (numSelected == 0) return;
+    if (!confirm('You are about to abort '+numSelected+' jobs. This can\'t be undone. Continue?'))
+    {
+      return;
+    }
+    frm.cmd.value = 'AbortJobs';
+    frm.submit();
+  }
   
   jobs.abortJob = function()

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

@@ -413 +413 @@
             title="Restore" 
             tooltip="Restore the selected (deleted) items"
+          />
+          <tbl:button 
+            id="btnAbort"
+            image="abort.png"
+            title="Abort&hellip;" 
+            tooltip="Abort the selected items"
           />
           <tbl:button