diff options
author | Nick Thomas <nick@gitlab.com> | 2017-04-13 16:20:04 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-04-18 15:41:17 +0100 |
commit | ab529cddac543c2052f7347d22e87f9a6ed04182 (patch) | |
tree | ee2ea5795593caee4c671ab009016e9bb5b1db57 /app/services/search | |
parent | aecaaa67c3d84637e6c691ed07b44115330dddcb (diff) | |
download | gitlab-ce-ab529cddac543c2052f7347d22e87f9a6ed04182.tar.gz |
Refactor group search out of global search
Diffstat (limited to 'app/services/search')
-rw-r--r-- | app/services/search/global_service.rb | 11 | ||||
-rw-r--r-- | app/services/search/group_service.rb | 18 |
2 files changed, 22 insertions, 7 deletions
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index 8409b592b72..ff188102b62 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -7,16 +7,13 @@ module Search end def execute - group = Group.find_by(id: params[:group_id]) if params[:group_id].present? - projects = ProjectsFinder.new(current_user: current_user).execute - - if group - projects = projects.inside_path(group.full_path) - end - Gitlab::SearchResults.new(current_user, projects, params[:search]) end + def projects + @projects ||= ProjectsFinder.new(current_user: current_user).execute + end + def scope @scope ||= begin allowed_scopes = %w[issues merge_requests milestones] diff --git a/app/services/search/group_service.rb b/app/services/search/group_service.rb new file mode 100644 index 00000000000..29478e3251f --- /dev/null +++ b/app/services/search/group_service.rb @@ -0,0 +1,18 @@ +module Search + class GroupService < Search::GlobalService + attr_accessor :group + + def initialize(user, group, params) + super(user, params) + + @group = group + end + + def projects + return Project.none unless group + return @projects if defined? @projects + + @projects = super.inside_path(group.full_path) + end + end +end |