[ARVADOS] updated: 1.1.3-25-g43540c6

[Git user]

Summary of changes:
 .../_show_object_description_cell.html.erb                       | 2 +-
 .../workbench/app/views/container_requests/_state_label.html.erb | 8 ++++++++
 apps/workbench/app/views/projects/_show_contents_rows.html.erb   | 9 ---------
 apps/workbench/app/views/projects/_show_tab_contents.html.erb    | 2 --
 4 files changed, 9 insertions(+), 12 deletions(-)
 copy apps/workbench/app/views/{pipeline_instances => container_requests}/_show_object_description_cell.html.erb (64%)
 create mode 100644 apps/workbench/app/views/container_requests/_state_label.html.erb

       via  43540c6be0228ffd5c01cdfaefed35ddc604fe5e (commit)
      from  371ce4b14c96e0f515586c55387d95c17e1670b3 (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 43540c6be0228ffd5c01cdfaefed35ddc604fe5e
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Feb 13 10:56:44 2018 -0300

    12863: Adds CR's state label on description cell.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/views/container_requests/_show_object_description_cell.html.erb b/apps/workbench/app/views/container_requests/_show_object_description_cell.html.erb
new file mode 100644
index 0000000..2df207a
--- /dev/null
+++ b/apps/workbench/app/views/container_requests/_show_object_description_cell.html.erb
@@ -0,0 +1,8 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<div class="nowrap">
+  <%= object.content_summary %><br />
+  <%= render partial: 'container_requests/state_label', locals: {object: object} %>
+</div>
diff --git a/apps/workbench/app/views/container_requests/_state_label.html.erb b/apps/workbench/app/views/container_requests/_state_label.html.erb
new file mode 100644
index 0000000..1ddd2b2
--- /dev/null
+++ b/apps/workbench/app/views/container_requests/_state_label.html.erb
@@ -0,0 +1,8 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<% wu = object.work_unit object.name %>
+<span class="label label-<%=wu.state_bootstrap_class%>">
+  <%=wu.state_label%>
+</span>
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 f22af3b..d440c46 100644
--- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
@@ -30,15 +30,6 @@ 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 4b37cda..2e5c8a3 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -90,7 +90,6 @@ 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>
@@ -101,7 +100,6 @@ 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
--