projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10846-nodemanager-errors' closes #10846
[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 00ce0a53825fa0228c267cc9365080e62099a630..c39b7c4317d56fdcd7d31f95116e23572bcbec49 100644
(file)
--- a/
apps/workbench/app/controllers/jobs_controller.rb
+++ b/
apps/workbench/app/controllers/jobs_controller.rb
@@
-1,4
+1,8
@@
class JobsController < ApplicationController
class JobsController < ApplicationController
+ skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+ Rails.configuration.anonymous_user_token and
+ 'show' == ctrl.action_name
+ }
def generate_provenance(jobs)
return if params['tab_pane'] != "Provenance"
def generate_provenance(jobs)
return if params['tab_pane'] != "Provenance"
@@
-24,12
+28,9
@@
class JobsController < ApplicationController
nodes[c[:portable_data_hash]] = c
end
nodes[c[:portable_data_hash]] = c
end
- nodes.each do |n|
- puts "\n#{n.inspect}"
- end
-
@svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
:request => request,
@svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
:request => request,
+ :direction => :top_down,
:all_script_parameters => true,
:script_version_nodes => true}
end
:all_script_parameters => true,
:script_version_nodes => true}
end
@@
-60,6
+61,15
@@
class JobsController < ApplicationController
super
end
super
end
+ def logs
+ @logs = @object.
+ stderr_log_query(Rails.configuration.running_job_log_records_to_fetch).
+ map { |e| e.serializable_hash.merge({ 'prepend' => true }) }
+ respond_to do |format|
+ format.json { render json: @logs }
+ end
+ end
+
def index_pane_list
if params[:uuid]
%w(Recent Provenance)
def index_pane_list
if params[:uuid]
%w(Recent Provenance)