projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2961: Don't call #render_index from #index on folders_controller because #index
[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 f693fa6428fde5ee5899ab6a4758b4120bb1adb2..b7526c949a2c6ea28daf6807fa8545350bf4ac6a 100644
(file)
--- a/
apps/workbench/app/controllers/jobs_controller.rb
+++ b/
apps/workbench/app/controllers/jobs_controller.rb
@@
-1,6
+1,8
@@
class JobsController < ApplicationController
def generate_provenance(jobs)
class JobsController < ApplicationController
def generate_provenance(jobs)
+ return if params['tab_pane'] != "Provenance"
+
nodes = []
collections = []
jobs.each do |j|
nodes = []
collections = []
jobs.each do |j|
@@
-25,14
+27,21
@@
class JobsController < ApplicationController
if params[:uuid]
@objects = Job.where(uuid: params[:uuid])
generate_provenance(@objects)
if params[:uuid]
@objects = Job.where(uuid: params[:uuid])
generate_provenance(@objects)
+ render_index
else
@limit = 20
super
end
end
else
@limit = 20
super
end
end
+ def cancel
+ @object.cancel
+ redirect_to @object
+ end
+
def show
generate_provenance([@object])
def show
generate_provenance([@object])
+ super
end
def index_pane_list
end
def index_pane_list