4285: prepend './' to file path being retrieved when it is in a subdir in a collection.

[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 ff3ac6b98eba40ee3d1be2f34c72ec26fa9450ca..40f4378544cb7c38ee659a3055874bed8f9cb533 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -36,7 +36,11 @@ class JobsController < ApplicationController
 
   def cancel
     @object.cancel
-    redirect_to @object
+    if params[:return_to]
+      redirect_to params[:return_to]
+    else
+      redirect_to @object
+    end
   end
 
   def show
@@ -53,6 +57,6 @@ class JobsController < ApplicationController
   end
 
   def show_pane_list
-    %w(Status Details Provenance Advanced)
+    %w(Status Log Details Provenance Advanced)
   end
 end