From 8c5edd2dcf46d372510ba8eeaa72aa5807ef6865 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 4 May 2019 22:47:39 +0300 Subject: [PATCH] #2032: Use context and project filters in API also when not requesting only done items --- app/controllers/todos_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 4d0ab8f5..26c16aee 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -12,6 +12,14 @@ class TodosController < ApplicationController init_data_for_sidebar unless mobile? @todos = current_user.todos.includes(Todo::DEFAULT_INCLUDES) + if params[:context_id] + context = current_user.contexts.find(params[:context_id]) + @todos = @todos.where('context_id' => context.id) + end + if params[:project_id] + project = current_user.projects.find(params[:project_id]) + @todos = @todos.where('project_id' => project.id) + end @todos = @todos.limit(sanitize(params[:limit])) if params[:limit] @not_done_todos = get_not_done_todos