[ARVADOS] updated: 2c60e15078452202ff58eac99d44920448fb7b9a

[Git user]

Summary of changes:
 .../application/_show_text_with_locators.html.erb  | 14 ++++++++++
 .../views/work_units/_component_detail.html.erb    | 30 ++--------------------
 2 files changed, 16 insertions(+), 28 deletions(-)
 create mode 100644 apps/workbench/app/views/application/_show_text_with_locators.html.erb

       via  2c60e15078452202ff58eac99d44920448fb7b9a (commit)
      from  dd69c4bad124d39f876ec6fb0e733e2db289a4bd (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 2c60e15078452202ff58eac99d44920448fb7b9a
Author: radhika <radhika at curoverse.com>
Date:   Tue May 9 07:33:51 2017 -0400

    10645: refactor the display of text with locators into a partial

diff --git a/apps/workbench/app/views/application/_show_text_with_locators.html.erb b/apps/workbench/app/views/application/_show_text_with_locators.html.erb
new file mode 100644
index 0000000..9662e30
--- /dev/null
+++ b/apps/workbench/app/views/application/_show_text_with_locators.html.erb
@@ -0,0 +1,14 @@
+<% data_height = data_height || 100 %>
+  <div style="max-height:<%=data_height%>px; overflow:auto;">
+    <% text_data.each_line do |l| %>
+      <% text_part = l %>
+      <% match = keep_locator_in_json l %>
+      <% if match %>
+        <% text_part = match[1] %>
+        <% rindex = match[2].rindex('"'); match2 = match[2][0..rindex-1] %>
+        <% pdh_readable = object_readable(match2) %>
+        <% quote_char = '"' %>
+      <% end %>
+      <span style="white-space: pre-wrap; margin: none;"><%= text_part %><% if match %><% if pdh_readable then %><%= link_to_arvados_object_if_readable(match[3], match[3], friendly_name: true) %><%= link_to_arvados_object_if_readable(match2, match2, link_text: match[4]) %><% else %><%= match2%><% end %><%=quote_char+match[5]%><br/><% end %></span>
+    <% end %>
+  </div>
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 e87e5b5..82cd42b 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -156,22 +156,8 @@
                   </td>
                   <td style="word-wrap: break-all;">
                     <% if k == :command %>
-                      <div style="max-height:200px; overflow-y:auto;">
                         <% val = JSON.pretty_generate(val) %>
-                        <% val.each_line do |l| %>
-                          <% l.split(' ').each do |w| %>
-                            <% match = keep_locator_in_json w %>
-                            <% if match %>
-                              <% rindex = match[2].rindex('"'); match2 = match[2][0..rindex-1] %>
-                              <% pdh_readable = object_readable(match2) %>
-                              <% quote_char = '"' %>
-                              <%= match[1] %><% if pdh_readable then %><%= link_to_arvados_object_if_readable(match[3], match[3], friendly_name: true) %><%= link_to_arvados_object_if_readable(match2, match2, link_text: match[4]) %><% else %><%= match2%><% end %><%=quote_char+match[5]%>
-                            <% else %>
-                              <%= w %>
-                            <% end %>
-                          <% end %>
-                        <% end %>
-                      </div>
+                        <%= render partial: 'show_text_with_locators', locals: {data_height: 200, text_data: val} %>
                     <% else %>
                       <%= val %>
                     <% end %>
@@ -191,19 +177,7 @@
                     cwl.input.json:
                   </td>
                   <td style="word-wrap: break-all;">
-                    <div style="max-height:400px; overflow:auto;">
-                      <% mnt_inputs.each_line do |l| %>
-                        <% text_part = l %>
-                          <% match = keep_locator_in_json l %>
-                          <% if match %>
-                            <% text_part = match[1] %>
-                            <% rindex = match[2].rindex('"'); match2 = match[2][0..rindex-1] %>
-                            <% pdh_readable = object_readable(match2) %>
-                            <% quote_char = '"' %>
-                          <% end %>
-                          <span style="white-space: pre-wrap; margin: none;"><%= text_part %><% if match %><% if pdh_readable then %><%= link_to_arvados_object_if_readable(match[3], match[3], friendly_name: true) %><%= link_to_arvados_object_if_readable(match2, match2, link_text: match[4]) %><% else %><%= match2%><% end %><%=quote_char+match[5]%><br/><% end %></span>
-                      <% end %>
-                    </div>
+                    <%= render partial: 'show_text_with_locators', locals: {data_height: 400, text_data: mnt_inputs} %>
                   </td>
                 </tr>
               <% end %>

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


hooks/post-receive
--