diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-03-01 20:04:37 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-03-11 23:25:22 +0300 |
commit | ec349dc1b6659d8f691cb1c1fb287aa05c9d9246 (patch) | |
tree | 26356f1a05aaa978cef7d1c2c6e81e0def2d97ba /lib | |
parent | 42fde69d39234368f8252febc9bf6ca3eca6f275 (diff) |
Refactor Gitlab::ProjectSearchResults
Previously this class would be given a project ID which was then used to
retrieve the corresponding Project object. However, in all cases the
Project object was already known as it was used to grab the ID to pass
to ProjectSearchResults. By just passing a Project instead we remove the
need for an extra query as well as the need for some other complexity
in this class.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/project_search_results.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 70de6a74e76..f36600c5756 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -2,8 +2,8 @@ module Gitlab class ProjectSearchResults < SearchResults attr_reader :project, :repository_ref - def initialize(project_id, query, repository_ref = nil) - @project = Project.find(project_id) + def initialize(project, query, repository_ref = nil) + @project = project @repository_ref = if repository_ref.present? repository_ref else @@ -73,7 +73,7 @@ module Gitlab end def notes - Note.where(project_id: limit_project_ids).user.search(query).order('updated_at DESC') + project.notes.user.search(query).order('updated_at DESC') end def commits @@ -83,9 +83,5 @@ module Gitlab project.repository.find_commits_by_message(query).compact end end - - def limit_project_ids - [project.id] - end end end |