[ARVADOS] created: 1.1.3-24-g371ce4b

[Git user]

        at  371ce4b14c96e0f515586c55387d95c17e1670b3 (commit)


commit 371ce4b14c96e0f515586c55387d95c17e1670b3
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Feb 12 19:41:13 2018 -0300

    12863: Adds column showing process status on project pages.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/views/projects/_show_contents_rows.html.erb b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
index d440c46..f22af3b 100644
--- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
@@ -30,6 +30,15 @@ SPDX-License-Identifier: AGPL-3.0 %>
     </td>
 
     <td>
+    <% if object.respond_to?(:work_unit) %>
+      <% wu = object.work_unit object.name %>
+      <span class="label label-<%=wu.state_bootstrap_class%>">
+        <%=wu.state_label%>
+      </span>
+    <% end %>
+    </td>
+
+    <td>
       <% if object.respond_to?(:name) %>
         <%= render_editable_attribute (name_link || object), 'name', nil, {}, {tiptitle: 'rename'} %>
       <% end %>
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 2e5c8a3..4b37cda 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -90,6 +90,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
       <col width="0*" style="max-width: fit-content;" />
       <col width="0*" style="max-width: fit-content;" />
       <col width="0*" style="max-width: fit-content;" />
+      <col width="0*" style="max-width: fit-content;" />
       <col width="60%" style="width: 60%;" />
       <col width="40%" style="width: 40%;" />
     </colgroup>
@@ -100,6 +101,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <th></th>
         <th></th>
         <th></th>
+        <th></th>
         <% sort_order = sortable_columns['name'].gsub(/\s/,'') if sortable_columns['name'] %>
         <th <% if !sort_order.nil? %>
               data-sort-order='<%= sort_order %>'

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


hooks/post-receive
--