[ARVADOS] updated: 178f2834f7c9585485df30b1fe0e53b27e4edac5

git at public.curoverse.com git at public.curoverse.com
Thu May 22 11:04:54 EDT 2014


Summary of changes:
 .../app/views/pipeline_instances/_show_components.html.erb | 14 +++++---------
 .../pipeline_instances/_show_components_editable.html.erb  |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

       via  178f2834f7c9585485df30b1fe0e53b27e4edac5 (commit)
      from  2d4553d3d8e6f4d2e8f17e21664d46607a11dfb8 (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 178f2834f7c9585485df30b1fe0e53b27e4edac5
Author: radhika <radhika at curoverse.com>
Date:   Thu May 22 11:04:01 2014 -0400

    2756: component name should be plain, not styled with label, not a link to the job.

diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index cf8f001..e1177a1 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -48,17 +48,13 @@
   </thead>
   <tbody>
     <% render_pipeline_jobs.each do |pj| %>
+      <% if pj[:job].andand[:uuid]
+           pipeline_jobs << pj[:job]
+           pipeline_job_uuids << pj[:job][:uuid]
+         end %>
     <tr>
       <td>
-        <% job_status = render(partial: 'job_status_label',
-                               locals: { :j => pj[:job], :title => pj[:name] }) %>
-        <% if pj[:job].andand[:uuid] %>
-          <%= link_to(job_status, job_url(id: pj[:job][:uuid])) %>
-          <% pipeline_jobs << pj[:job] %>
-          <% pipeline_job_uuids << pj[:job][:uuid] %>
-        <% else %>
-          <%= job_status %>
-        <% end %>
+        <%= pj[:name] %>
       </td><td>
         <%= pj[:script] %>
         <br /><span class="deemphasize"><%= pj[:script_version] %></span>
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
index 57c73fb..11142a3 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
@@ -23,7 +23,7 @@
     <% @object.components.each do |k, component| %>
       <% next if !component %>
       <tr>
-        <td><span class="label label-default"><%= k %></span></td>
+        <td><%= k %></td>
 
         <td><%= render_pipeline_component_attribute (editable && @object), :components, [k, :script], component[:script] %></td>
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list