Pass project IDs relation to ProjectsFinder instead of using a block
This commit is contained in:
parent
d13c36f72d
commit
76db0dc115
|
@ -1,7 +1,7 @@
|
|||
class ProjectsFinder < UnionFinder
|
||||
def execute(current_user = nil, options = {}, &block)
|
||||
def execute(current_user = nil, project_ids_relation = nil)
|
||||
segments = all_projects(current_user)
|
||||
segments.map!(&block) if block
|
||||
segments.map! { |s| s.where(id: project_ids_relation) } if project_ids_relation
|
||||
|
||||
find_union(segments, Project)
|
||||
end
|
||||
|
|
|
@ -95,9 +95,7 @@ class TodosFinder
|
|||
|
||||
def projects(items)
|
||||
item_project_ids = items.reorder(nil).select(:project_id)
|
||||
ProjectsFinder.new.execute(current_user) do |relation|
|
||||
relation.where(id: item_project_ids)
|
||||
end
|
||||
ProjectsFinder.new.execute(current_user, item_project_ids)
|
||||
end
|
||||
|
||||
def type?
|
||||
|
|
Loading…
Reference in New Issue