projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4091: enhance code to handle the case where there are more than one item in the next...
[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 4746635c72a3ea141b64648a1efc675620be2657..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,7
+18,7
@@
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
:script_version_nodes => true}
end
@@
-25,14
+27,25
@@
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
+ if params[:return_to]
+ redirect_to params[:return_to]
+ else
+ redirect_to @object
+ end
+ end
+
def show
generate_provenance([@object])
def show
generate_provenance([@object])
+ super
end
def index_pane_list
end
def index_pane_list
@@
-44,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