projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2809: Merge branch '2809-workbench-rails4' refs #2809
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
pipeline_instances_controller.rb
diff --git
a/apps/workbench/app/controllers/pipeline_instances_controller.rb
b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index a8a35b510b4b93fbf6905a5c8cb85602b3bfc7bb..d54cd4961e944108f719348eb21fe497f6facee3 100644
(file)
--- a/
apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/
apps/workbench/app/controllers/pipeline_instances_controller.rb
@@
-15,6
+15,12
@@
class PipelineInstancesController < ApplicationController
p.components.each do |k, v|
j = v[:job] || next
p.components.each do |k, v|
j = v[:job] || next
+ # The graph is interested in whether the component is
+ # indicated as persistent, more than whether the job
+ # satisfying it (which could have been reused, or someone
+ # else's) is.
+ j[:output_is_persistent] = v[:output_is_persistent]
+
uuid = j[:uuid].intern
provenance[uuid] = j
pips[uuid] = 0 unless pips[uuid] != nil
uuid = j[:uuid].intern
provenance[uuid] = j
pips[uuid] = 0 unless pips[uuid] != nil
@@
-45,12
+51,6
@@
class PipelineInstancesController < ApplicationController
end
def show
end
def show
- if @object.components.empty? and @object.pipeline_template_uuid
- template = PipelineTemplate.find(@object.pipeline_template_uuid)
- @object.components= template.components
- @object.save
- end
-
@pipelines = [@object]
if params[:compare]
@pipelines = [@object]
if params[:compare]
@@
-62,6
+62,7
@@
class PipelineInstancesController < ApplicationController
provenance, pips = graph(@pipelines)
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
provenance, pips = graph(@pipelines)
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
@@
-133,6
+134,7
@@
class PipelineInstancesController < ApplicationController
@pipelines = @objects
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
@pipelines = @objects
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
@@
-147,6
+149,11
@@
class PipelineInstancesController < ApplicationController
%w(Compare Graph)
end
%w(Compare Graph)
end
+ def index
+ @limit = 20
+ super
+ end
+
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array