[ARVADOS] updated: 3e21feb8369cfe0f6b9f5f25e2e952db3bc424c8

[Git user]

Summary of changes:
 apps/workbench/app/models/proxy_work_unit.rb                |  4 ++++
 apps/workbench/app/models/work_unit.rb                      |  4 ++++
 apps/workbench/app/views/projects/_show_dashboard.html.erb  | 11 +----------
 .../app/views/work_unit/_show_all_processes.html.erb        | 12 ++++++++----
 .../app/views/work_unit/_show_all_processes_rows.html.erb   |  7 +++++--
 apps/workbench/app/views/work_unit/_show_output.html.erb    | 13 +++++++++++++
 6 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 apps/workbench/app/views/work_unit/_show_output.html.erb

       via  3e21feb8369cfe0f6b9f5f25e2e952db3bc424c8 (commit)
      from  9b349fcac93e57aff3adad8cb9960382f622777c (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 3e21feb8369cfe0f6b9f5f25e2e952db3bc424c8
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 6 11:48:58 2016 -0400

    9319: show output in each process row

diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index 7439d6e..53b4908 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -23,6 +23,10 @@ class ProxyWorkUnit < WorkUnit
     get(:modified_by_user_uuid)
   end
 
+  def owner_uuid
+    get(:owner_uuid)
+  end
+
   def created_at
     t = get(:created_at)
     t = Time.parse(t) if (t.is_a? String)
diff --git a/apps/workbench/app/models/work_unit.rb b/apps/workbench/app/models/work_unit.rb
index dee6a60..7b52365 100644
--- a/apps/workbench/app/models/work_unit.rb
+++ b/apps/workbench/app/models/work_unit.rb
@@ -17,6 +17,10 @@ class WorkUnit
     # returns uuid of the user who modified this work unit most recently
   end
 
+  def owner_uuid
+    # returns uuid of the owner of this work unit
+  end
+
   def created_at
     # returns created_at timestamp
   end
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 6dfa1bc..bf4b7f1 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -53,16 +53,7 @@
                     Active for <%= render_runtime(wu_time, false) %>
                   <% end %>
 
-                  <span class="pull-right text-overflow-ellipsis" style="max-width: 100%">
-                    <% outputs = wu.outputs %>
-                    <% if outputs.size == 0 %>
-                      No output.
-                    <% elsif outputs.size == 1 %>
-                      <i class="fa fa-fw fa-archive"></i> <%= link_to_if_arvados_object outputs[0], friendly_name: true %>
-                    <% else %>
-                      <%= render partial: 'work_unit/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:"pull-right"} %>
-                    <% end %>
-                  </span>
+                  <%= render partial: 'work_unit/show_output', locals: {wu: wu, align: 'pull-right', include_icon: true} %>
                 </div>
               </div>
 
diff --git a/apps/workbench/app/views/work_unit/_show_all_processes.html.erb b/apps/workbench/app/views/work_unit/_show_all_processes.html.erb
index 4049115..afb65ea 100644
--- a/apps/workbench/app/views/work_unit/_show_all_processes.html.erb
+++ b/apps/workbench/app/views/work_unit/_show_all_processes.html.erb
@@ -1,6 +1,6 @@
 <div class="container">
   <div class="row">
-    <div class="input-group pull-right">
+    <div class="pull-right">
       <input type="text" class="form-control filterable-control all-processes-filterable-control"
              placeholder="Search all processes"
              data-filterable-target="#all-processes-scroll"
@@ -12,11 +12,12 @@
     <div>
       <table class="table table-condensed table-fixedlayout arv-all-processes">
         <colgroup>
-          <col width="30%" />
-          <col width="10%" />
-          <col width="25%" />
           <col width="25%" />
           <col width="10%" />
+          <col width="20%" />
+          <col width="20%" />
+          <col width="20%" />
+          <col width="5%" />
         </colgroup>
 
         <thead>
@@ -34,6 +35,9 @@
         	    Created at
             </th>
             <th>
+              Output
+            </th>
+            <th>
             </th>
           </tr>
         </thead>
diff --git a/apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb b/apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb
index 4bd0fdf..16d28f6 100644
--- a/apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb
+++ b/apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb
@@ -8,10 +8,13 @@
       <span class="label label-<%= wu.state_bootstrap_class %>"><%= wu.state_label %></span>
     </td>
     <td>
-      <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
+      <%= link_to_if_arvados_object wu.owner_uuid, friendly_name: true %>
     </td>
     <td>
-      <%= wu.created_at %>
+      <%= render_localized_date(wu.created_at) %>
+    </td>
+    <td>
+      <%= render partial: 'work_unit/show_output', locals: {wu: wu, align: ''} %>
     </td>
     <td>
       <%= render partial: 'delete_object_button', locals: {object:obj} %>
diff --git a/apps/workbench/app/views/work_unit/_show_output.html.erb b/apps/workbench/app/views/work_unit/_show_output.html.erb
new file mode 100644
index 0000000..78032bb
--- /dev/null
+++ b/apps/workbench/app/views/work_unit/_show_output.html.erb
@@ -0,0 +1,13 @@
+<span class="<%=align%> text-overflow-ellipsis" style="max-width: 100%">
+  <% outputs = wu.outputs %>
+  <% if outputs.size == 0 %>
+    No output
+  <% elsif outputs.size == 1 %>
+    <% if defined?(include_icon) && include_icon %>
+      <i class="fa fa-fw fa-archive"></i>
+    <% end %>
+    <%= link_to_if_arvados_object outputs[0], friendly_name: true %>
+  <% else %>
+    <%= render partial: 'work_unit/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:align} %>
+  <% end %>
+</span>

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


hooks/post-receive
--