kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move filtering todos by projects not pending deletion into a scope on the todo model

Browse source
This commit is contained in:
DJ Mountney 2016-05-30 10:59:14 -07:00
parent 4ecc10fade
commit 4280575fc0
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/finders/todos_finder.rb
View file

@ -23,13 +23,7 @@ class TodosFinder
end end
def execute def execute
items = current_user.todos items = current_user.todos.not_pending_delete
# Filter out todos linked to project pending deletion
items = items.joins(
'INNER JOIN projects ON projects.id = todos.project_id AND projects.pending_delete = false'
)
items = by_action_id(items) items = by_action_id(items)
items = by_author(items) items = by_author(items)
items = by_project(items) items = by_project(items)

1
app/models/todo.rb
View file

@ -19,6 +19,7 @@ class Todo < ActiveRecord::Base
scope :pending, -> { with_state(:pending) } scope :pending, -> { with_state(:pending) }
scope :done, -> { with_state(:done) } scope :done, -> { with_state(:done) }
scope :not_pending_delete, -> { joins('INNER JOIN projects ON projects.id = todos.project_id AND projects.pending_delete = false') }
state_machine :state, initial: :pending do state_machine :state, initial: :pending do
event :done do event :done do