BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 4fda13b6 by Toon Claes
Options

Build options hash after finding the list of projects

Because this order makes more sense and makes the code easier to read.
parent 44fdf0a1
Showing with 6 additions and 5 deletions
lib/api/projects.rb
...@@ -68,16 +68,17 @@ module API ...@@ -68,16 +68,17 @@ module API
end end
def present_projects(options = {}) def present_projects(options = {})
options = options.reverse_merge(
with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
current_user: current_user
)
projects = ProjectsFinder.new(current_user: current_user).execute projects = ProjectsFinder.new(current_user: current_user).execute
projects = filter_projects(projects) projects = filter_projects(projects)
projects = projects.with_statistics if params[:statistics] projects = projects.with_statistics if params[:statistics]
projects = projects.with_issues_enabled if params[:with_issues_enabled] projects = projects.with_issues_enabled if params[:with_issues_enabled]
projects = projects.with_merge_requests_enabled if params[:with_merge_requests_enabled] projects = projects.with_merge_requests_enabled if params[:with_merge_requests_enabled]
options = options.reverse_merge(
with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
statistics: params[:statistics],
current_user: current_user
)
options[:with] = Entities::BasicProjectDetails if params[:simple] options[:with] = Entities::BasicProjectDetails if params[:simple]
present paginate(projects), options present paginate(projects), options
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment