Respect running_job_log_records_to_fetch in JobsController#logs.

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

diff --git a/apps/workbench/app/controllers/container_requests_controller.rb b/apps/workbench/app/controllers/container_requests_controller.rb
index ea268017fa8b1e4c29f8aa8f966fc34e63799fab..f5a68fec27eb00f64e1d027d29c3a4079dd0687b 100644 (file)
--- a/apps/workbench/app/controllers/container_requests_controller.rb
+++ b/apps/workbench/app/controllers/container_requests_controller.rb
@@ -1,9 +1,19 @@
 class ContainerRequestsController < ApplicationController
+  skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name
+  }
+
   def show_pane_list
     %w(Status Log Advanced)
   end
 
   def cancel
     @object.update_attributes! priority: 0
+    if params[:return_to]
+      redirect_to params[:return_to]
+    else
+      redirect_to @object
+    end
   end
 end