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

Rename Todos.with_api_entity_associations to with_entity_associations

Browse source 
Since this scope is used in both the controller and the API, we rename
it to make it clear that it's used for both.
This commit is contained in:
Stan Hu 2019-06-24 10:48:50 -07:00
parent 211a00473b
commit f2d932268d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/dashboard/todos_controller.rb
View file

@ -10,7 +10,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
def index
@sort = params[:sort]
@todos = @todos.page(params[:page])
@todos = @todos.with_api_entity_associations
@todos = @todos.with_entity_associations
return if redirect_out_of_range(@todos)
end

2
app/models/todo.rb
View file

@ -60,7 +60,7 @@ class Todo < ApplicationRecord
scope :for_type, -> (type) { where(target_type: type) }
scope :for_target, -> (id) { where(target_id: id) }
scope :for_commit, -> (id) { where(commit_id: id) }
scope :with_api_entity_associations, -> { preload(:target, :author, :note, group: :route, project: [:route, { namespace: :route }]) }
scope :with_entity_associations, -> { preload(:target, :author, :note, group: :route, project: [:route, { namespace: :route }]) }
scope :joins_issue_and_assignees, -> { left_joins(issue: :assignees) }
state_machine :state, initial: :pending do

2
lib/api/todos.rb
View file

@ -77,7 +77,7 @@ module API
use :pagination
end
get do
todos = paginate(find_todos.with_api_entity_associations)
todos = paginate(find_todos.with_entity_associations)
options = { with: Entities::Todo, current_user: current_user }
batch_load_issuable_metadata(todos, options)