[ARVADOS] created: 892e6e0a90064178d1d08f1c6c02828378adb7e5

[git at public.curoverse.com]

        at  892e6e0a90064178d1d08f1c6c02828378adb7e5 (commit)


commit 892e6e0a90064178d1d08f1c6c02828378adb7e5
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Jun 24 13:47:49 2014 -0400

    2985: distinguish between queued and unstarted jobs
    
    Job label is "queued" if it is has not been started but has tasks in a
    'todo' state.
    
    Fixes #3059.

diff --git a/apps/workbench/app/views/application/_job_status_label.html.erb b/apps/workbench/app/views/application/_job_status_label.html.erb
index 87b70fe..6095282 100644
--- a/apps/workbench/app/views/application/_job_status_label.html.erb
+++ b/apps/workbench/app/views/application/_job_status_label.html.erb
@@ -6,6 +6,8 @@
   <span class="label label-default"><%= if defined? title then title else 'finished' end %></span>
 <% elsif j[:started_at] %>
   <span class="label label-info"><%= if defined? title then title else 'running' end %></span>
+<% elsif j[:tasks_summary].andand[:todo].andand.> 0 %>
+  <span class="label label-default"><%= if defined? title then title else 'queued' end %></span>
 <% else %>
-  <span class="label label-default"><%= if defined? title then title else 'not running' end %></span>
+  <span class="label label-default"><%= if defined? title then title else 'not started' end %></span>
 <% end %>

commit 74bf1918b1e662a3baabeec0c44e5128bacf1c2e
Author: Tim Pierce <twp at curoverse.com>
Date:   Mon Jun 23 16:03:31 2014 -0400

    2985: display pipeline instance status in project summary page.
    
    Update pipeline_instance/_show_object_description_cell.html.erb partial
    view to render the pipeline status along with the description. (Fixes #3056)

diff --git a/apps/workbench/app/views/pipeline_instances/_show_object_description_cell.html.erb b/apps/workbench/app/views/pipeline_instances/_show_object_description_cell.html.erb
index 38f51a3..cd51c4b 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_object_description_cell.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_object_description_cell.html.erb
@@ -1,4 +1,5 @@
 <div class="nowrap">
-  <%= object.content_summary %><br />
+  <%= object.content_summary %>
+  <%= render :partial => "pipeline_status_label", :locals => {p: object} %><br />
   <%= render partial: 'pipeline_instances/component_labels', locals: {object: object} %>
 </div>

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


hooks/post-receive
--