Merge branch 'master' into 3296-user-profile

[arvados.git] / apps / workbench / app / controllers / jobs_controller.rb

diff --git a/apps/workbench/app/controllers/jobs_controller.rb b/apps/workbench/app/controllers/jobs_controller.rb
index 03d5cb38275a3d9361eee366430ed8208dd7ab04..b3204bf64e8d52cd3aa9d31315e0129225ef339d 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -27,10 +27,16 @@ class JobsController < ApplicationController
     if params[:uuid]
       @objects = Job.where(uuid: params[:uuid])
       generate_provenance(@objects)
+      render_index
     else
       @limit = 20
+      super
     end
-    super
+  end
+
+  def cancel
+    @object.cancel
+    redirect_to @object
   end
 
   def show
@@ -47,6 +53,6 @@ class JobsController < ApplicationController
   end
 
   def show_pane_list
-    %w(Attributes Provenance Metadata JSON API)
+    %w(Status Log Details Provenance Advanced)
   end
 end