[ARVADOS] updated: e49882e535f1464673d547ba37c636ec1eb8d0ab

[Git user]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb             |  6 ++++++
 .../app/views/work_units/_component_detail.html.erb          | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

       via  e49882e535f1464673d547ba37c636ec1eb8d0ab (commit)
      from  78408743bab09078a7361620fc6a6be524fdac73 (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 e49882e535f1464673d547ba37c636ec1eb8d0ab
Author: radhika <radhika at curoverse.com>
Date:   Mon May 8 18:43:54 2017 -0400

    10645: display PDHs in command as clickable collections.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 42215ee..58ad619 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -670,11 +670,17 @@ module ApplicationHelper
     render_runtime duration, use_words, round_to_min
   end
 
+  # Keep locators in input mounts are of the form \"keep:<pdh/file_path>\"
   MOUNT_INPUT_KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
   def mount_input_keep_locator str
     MOUNT_INPUT_KEEP_LOCATOR_REGEXP.match str
   end
 
+  KEEP_LOCATOR_REGEXP = /(.*)([0-9a-f]{32}\+\d+)(.*)/
+  def keep_locator str
+    KEEP_LOCATOR_REGEXP.match str
+  end
+
 private
   def is_textile?( object, attr )
     is_textile = object.textile_attributes.andand.include?(attr)
diff --git a/apps/workbench/app/views/work_units/_component_detail.html.erb b/apps/workbench/app/views/work_units/_component_detail.html.erb
index af0545d..c1d43af 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -157,7 +157,17 @@
                   <td style="word-wrap: break-all;">
                     <% if k == :command %>
                       <div style="max-height:200px; overflow-y:auto;">
-                        <%=val%>
+                        <% val = JSON.pretty_generate(val) %>
+                        <% val.each_line do |l| %>
+                          <% l.split(' ').each do |w| %>
+                            <% match = keep_locator w %>
+                            <% if match %>
+                              <%=match[1]%><%= link_to_arvados_object_if_readable(match[2], match[2], friendly_name: true) %><%=match[3]%>
+                            <% else %>
+                              <%= w %>
+                            <% end %>
+                          <% end %>
+                        <% end %>
                       </div>
                     <% else %>
                       <%= val %>

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


hooks/post-receive
--