projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3882-cancel-already-cancelled-job
[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 4705bb5204ed47ec9429901cb701b8ef69c3f984..40f4378544cb7c38ee659a3055874bed8f9cb533 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|
@@
-16,22
+18,34
@@
class JobsController < ApplicationController
@svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
:request => request,
@svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
:request => request,
- :all_script_parameters => true,
+ :all_script_parameters => true,
:script_version_nodes => true}
end
def index
@svg = ""
if params[:uuid]
:script_version_nodes => true}
end
def index
@svg = ""
if params[:uuid]
- @jobs = Job.where(uuid: params[:uuid])
- generate_provenance(@jobs)
+ @objects = Job.where(uuid: params[:uuid])
+ generate_provenance(@objects)
+ render_index
+ else
+ @limit = 20
+ super
+ end
+ end
+
+ def cancel
+ @object.cancel
+ if params[:return_to]
+ redirect_to params[:return_to]
else
else
- @jobs = Job.all
+ redirect_to @object
end
end
def show
generate_provenance([@object])
end
end
def show
generate_provenance([@object])
+ super
end
def index_pane_list
end
def index_pane_list
@@
-43,6
+57,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