diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/search_controller.rb | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index f5c3bb133ed..8104f3d077c 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -3,16 +3,7 @@ class SearchController < ApplicationController project_id = params[:project_id] group_id = params[:group_id] - project_ids = current_user.authorized_projects.map(&:id) - - if group_id.present? - @group = Group.find(group_id) - group_project_ids = @group.projects.map(&:id) - project_ids.select! { |id| group_project_ids.include?(id)} - elsif project_id.present? - @project = Project.find(params[:project_id]) - project_ids.select! { |id| id == project_id.to_i} - end + project_ids = find_project_ids(group_id, project_id) result = SearchContext.new(project_ids, params).execute @@ -23,4 +14,18 @@ class SearchController < ApplicationController @blobs = Kaminari.paginate_array(result[:blobs]).page(params[:page]).per(20) @total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count end + + def find_project_ids(group_id, project_id) + project_ids = current_user.authorized_projects.map(&:id) + + if group_id.present? + @group = Group.find(group_id) + group_project_ids = @group.projects.map(&:id) + project_ids.select! { |id| group_project_ids.include?(id) } + elsif project_id.present? + @project = Project.find(project_id) + project_ids = @project.public ? [@project.id] : project_ids.select { |id| id == project_id.to_i } + end + project_ids + end end |