diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 0ed68cbd..efa84ab9 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -4,7 +4,7 @@ <%= render :partial => "projects/project", :locals => { :project => @project, :collapsible => false } %> - <%= render :partial => "todos/deferred", :locals => { :deferred => @deferred, :collapsible => false, :append_descriptor => "in this project", :parent_container_type => 'project' } %> + <%= render :partial => "todos/deferred", :locals => { :deferred => @deferred, :collapsible => false, :append_descriptor => "in this project", :parent_container_type => 'project', :pending => @pending } %> <% unless @max_completed==0 -%> <%= render :partial => "todos/completed", :locals => { :done => @done, :collapsible => false, :suppress_project => true, :append_descriptor => "in this project" } %> <% end -%> diff --git a/app/views/todos/_deferred.rhtml b/app/views/todos/_deferred.rhtml index 58c16756..c38e1561 100644 --- a/app/views/todos/_deferred.rhtml +++ b/app/views/todos/_deferred.rhtml @@ -3,15 +3,16 @@ <% if collapsible %> <%= image_tag("collapse.png") %> <% end %> - Deferred actions <%= append_descriptor ? append_descriptor : '' %> + Deferred/pending actions <%= append_descriptor ? append_descriptor : '' %>
-
-

Currently there are no deferred actions

+
+

Currently there are no deferred or pending actions

<%= render :partial => "todos/todo", :collection => deferred, :locals => { :parent_container_type => parent_container_type } %> + <%= render :partial => "todos/todo", :collection => pending, :locals => { :parent_container_type => parent_container_type } %>
-
\ No newline at end of file +