projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2800: Merge branch 'master' into 2800-pgs
[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 9de82d82f950dfc8f5bf32846e9cb31ef059eb1b..b3204bf64e8d52cd3aa9d31315e0129225ef339d 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,10
+27,16
@@
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
else
@limit = 20
+ super
end
end
- super
+ end
+
+ def cancel
+ @object.cancel
+ redirect_to @object
end
def show
end
def show
@@
-45,6
+53,6
@@
class JobsController < ApplicationController
end
def show_pane_list
end
def show_pane_list
- %w(
Attributes Provenance Metadata JSON API
)
+ %w(
Status Log Details Provenance Advanced
)
end
end
end
end