10645: regexp for keep_locator_in_json format

[arvados.git] / apps / workbench / app / views / work_units / _component_detail.html.erb

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 c1d43af031c12add335d7cf5491475b9231d0443..a767a1621536fbed3241277ac2b14683bd92e456 100644 (file)
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -160,9 +160,11 @@
                         <% val = JSON.pretty_generate(val) %>
                         <% val.each_line do |l| %>
                           <% l.split(' ').each do |w| %>
-                            <% match = keep_locator w %>
+                            <% match = keep_locator_in_json w %>
                             <% if match %>
-                              <%=match[1]%><%= link_to_arvados_object_if_readable(match[2], match[2], friendly_name: true) %><%=match[3]%>
+                              <% pdh_readable = object_readable(match[2]) %>
+                              <% 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(match[2], match[2], link_text: match[4]) %><%=quote_char%><% else %><%= match[2]%><% end %><%=match[5]%>
                             <% else %>
                               <%= w %>
                             <% end %>
@@ -191,13 +193,13 @@
                     <div style="max-height:400px; overflow:auto;">
                       <% mnt_inputs.each_line do |l| %>
                         <% text_part = l %>
-                          <% match = mount_input_keep_locator l %>
+                          <% match = keep_locator_in_json l %>
                           <% if match %>
                             <% text_part = match[1] %>
                             <% pdh_readable = object_readable(match[2]) %>
                             <% quote_char = '"' %>
                           <% end %>
-                          <span style="white-space: pre-wrap; margin: none;"><%= text_part %><%= if match then link_to_arvados_object_if_readable(match[3], match[3], friendly_name: true) end %><% if pdh_readable then %><%= link_to_arvados_object_if_readable(match[2], match[2], link_text: match[4]) %><%=quote_char + match[5]%><br/><% end %></span>
+                          <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(match[2], match[2], link_text: match[4]) %><%=quote_char%><% else %><%= match[2]%><% end %><%=match[5]%><br/><% end %></span>
                       <% end %>
                     </div>
                   </td>