From caec4f214abcaad57b4bc2ad11672297034e5059 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Sat, 20 Apr 2013 20:20:57 +0200 Subject: [PATCH] enable group by project for tickler --- app/controllers/todos_controller.rb | 2 ++ app/views/todos/list_deferred.html.erb | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index f69d1c91..8fd918b5 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -590,10 +590,12 @@ class TodosController < ApplicationController @page_title = t('todos.deferred_tasks_title') @contexts_to_show = @contexts = current_user.contexts + @projects_to_show = @projects = current_user.projects includes = params[:format]=='xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES @not_done_todos = current_user.todos.deferred.includes(includes) + current_user.todos.pending.includes(includes) + @todos_without_project = @not_done_todos.select{|t|t.project.nil?} @down_count = @count = @not_done_todos.size respond_to do |format| diff --git a/app/views/todos/list_deferred.html.erb b/app/views/todos/list_deferred.html.erb index 8e04c92f..599855b9 100644 --- a/app/views/todos/list_deferred.html.erb +++ b/app/views/todos/list_deferred.html.erb @@ -2,7 +2,11 @@ <%= empty_message_holder("deferred_pending", @not_done_todos.empty?) %> - <%= render :partial => @contexts, :locals => { :settings => {:collapsible => true} } %> + <%= show_grouped_todos %> + + <% if @group_view_by == 'project' -%> + <%= show_todos_without_project(@todos_without_project) -%> + <% end -%>