[ARVADOS] updated: 260e85a9d9cf2c20313bcf2edb63da57bdd3a69f

[Git user]

Summary of changes:
 apps/workbench/app/helpers/provenance_helper.rb         | 17 ++++++++++-------
 .../views/container_requests/_show_provenance.html.erb  |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

       via  260e85a9d9cf2c20313bcf2edb63da57bdd3a69f (commit)
      from  30146198f24c70941d95af714e036ff3c451626c (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 260e85a9d9cf2c20313bcf2edb63da57bdd3a69f
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Wed Apr 26 08:56:01 2017 -0300

    10111: Only include those mounts that are declared on the cwl input definition.
    Removed trailing spaces.

diff --git a/apps/workbench/app/helpers/provenance_helper.rb b/apps/workbench/app/helpers/provenance_helper.rb
index 38e952a..36513b3 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -108,13 +108,16 @@ module ProvenanceHelper
       uuid = cr[:uuid]
       gr = ""
 
-      ProvenanceHelper::find_collections cr[:mounts], 'mounts' do |col_hash, col_uuid, key|
-        if col_uuid
-          gr += describe_node(col_uuid)
-          gr += edge(col_uuid, uuid, {:label => key})
-        else
-          gr += describe_node(col_hash)
-          gr += edge(col_hash, uuid, {:label => key})
+      input_obj = cr[:mounts].andand[:"/var/lib/cwl/cwl.input.json"].andand[:content]
+      if input_obj
+        ProvenanceHelper::find_collections input_obj, 'mounts' do |col_hash, col_uuid, key|
+          if col_uuid
+            gr += describe_node(col_uuid)
+            gr += edge(col_uuid, uuid, {:label => key})
+          else
+            gr += describe_node(col_hash)
+            gr += edge(col_hash, uuid, {:label => key})
+          end
         end
       end
 
diff --git a/apps/workbench/app/views/container_requests/_show_provenance.html.erb b/apps/workbench/app/views/container_requests/_show_provenance.html.erb
index 253af56..45058b2 100644
--- a/apps/workbench/app/views/container_requests/_show_provenance.html.erb
+++ b/apps/workbench/app/views/container_requests/_show_provenance.html.erb
@@ -1,4 +1,4 @@
 <%= render partial: 'application/svg_div', locals: {
-      divId: "provenance_graph", 
-      svgId: "provenance_svg", 
+      divId: "provenance_graph",
+      svgId: "provenance_svg",
       svg: @svg } %>

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


hooks/post-receive
--