[ARVADOS] updated: cc527a74c89f44267c50a52194ec0560484a72a0

[git at public.curoverse.com]

Summary of changes:
 .../controllers/pipeline_instances_controller.rb   |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

       via  cc527a74c89f44267c50a52194ec0560484a72a0 (commit)
       via  0017e49656e63d6ff348d54a61c0dcdffa74db9a (commit)
      from  15bc31fe70042ac6235d9984f8a116b8640b92c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cc527a74c89f44267c50a52194ec0560484a72a0
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Feb 5 12:30:03 2014 -0800

    Call super in pipeline_instances#show to make preview/js/json
    rendering work.
    
    refs #1977

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 49f2a80..588cd0c 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -60,6 +60,7 @@ class PipelineInstancesController < ApplicationController
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
       :pips => pips }
+    super
   end
 
   def compare

commit 0017e49656e63d6ff348d54a61c0dcdffa74db9a
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Feb 5 12:29:13 2014 -0800

    Fix handling of pipeline components with no job/output yet.
    
    refs #1977

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 4798271..49f2a80 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -13,7 +13,7 @@ class PipelineInstancesController < ApplicationController
       collections = []
 
       p.components.each do |k, v|
-        j = v[:job]
+        j = v[:job] || next
 
         uuid = j[:uuid].intern
         provenance[uuid] = j
@@ -31,7 +31,7 @@ class PipelineInstancesController < ApplicationController
         pips[uuid] |= n
       end
 
-      Collection.where(uuid: collections).each do |c|
+      Collection.where(uuid: collections.compact).each do |c|
         uuid = c.uuid.intern
         provenance[uuid] = c
         pips[uuid] = 0 unless pips[uuid] != nil

-----------------------------------------------------------------------


hooks/post-receive
--