From 91c7b266cdffbd82ac70f35ca9bd5d08b989dbe3 Mon Sep 17 00:00:00 2001 From: Izaak Alpert Date: Wed, 23 Oct 2013 16:27:40 -0400 Subject: Allow public repo searching GITLAB-1386 Change-Id: I9a0bbe8db1a9bb00cef33b3e1854d78844b70a45 --- app/controllers/search_controller.rb | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'app/controllers/search_controller.rb') 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 -- cgit v1.2.1 From b89d8497f6bf911a74c350dfce6256c2a08ef59b Mon Sep 17 00:00:00 2001 From: Izaak Alpert Date: Wed, 13 Nov 2013 15:07:53 -0500 Subject: Updated convience method to private --- app/controllers/search_controller.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/controllers/search_controller.rb') diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 8104f3d077c..35f885fbacf 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -15,6 +15,8 @@ class SearchController < ApplicationController @total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count end + private + def find_project_ids(group_id, project_id) project_ids = current_user.authorized_projects.map(&:id) -- cgit v1.2.1