summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/stylesheets/generic/nav.scss5
-rw-r--r--app/contexts/search/global_context.rb40
-rw-r--r--app/contexts/search/project_context.rb37
-rw-r--r--app/contexts/search_context.rb42
-rw-r--r--app/controllers/search_controller.rb36
-rw-r--r--app/views/search/_filter.html.haml4
-rw-r--r--app/views/search/_global_results.html.haml6
-rw-r--r--app/views/search/_project_results.html.haml12
-rw-r--r--app/views/search/_results.html.haml12
-rw-r--r--spec/contexts/search_context_spec.rb53
-rw-r--r--spec/controllers/search_controller_spec.rb18
11 files changed, 137 insertions, 128 deletions
diff --git a/app/assets/stylesheets/generic/nav.scss b/app/assets/stylesheets/generic/nav.scss
index ec01988d52d..8d9fd4786a5 100644
--- a/app/assets/stylesheets/generic/nav.scss
+++ b/app/assets/stylesheets/generic/nav.scss
@@ -7,12 +7,9 @@
background: $primary_color;
}
- > li > a {
- @include border-radius(0);
- }
-
&.nav-stacked {
> li > a {
+ @include border-radius(0);
border-left: 4px solid #EEE;
padding: 12px;
color: #777;
diff --git a/app/contexts/search/global_context.rb b/app/contexts/search/global_context.rb
new file mode 100644
index 00000000000..74e746018e6
--- /dev/null
+++ b/app/contexts/search/global_context.rb
@@ -0,0 +1,40 @@
+module Search
+ class GlobalContext
+ attr_accessor :current_user, :params
+
+ def initialize(user, params)
+ @current_user, @params = user, params.dup
+ end
+
+ def execute
+ query = params[:search]
+ query = Shellwords.shellescape(query) if query.present?
+ return result unless query.present?
+
+ authorized_projects_ids = []
+ authorized_projects_ids += current_user.authorized_projects.pluck(:id) if current_user
+ authorized_projects_ids += Project.public_or_internal_only(current_user).pluck(:id)
+
+ group = Group.find_by_id(params[:group_id]) if params[:group_id].present?
+ projects = Project.where(id: authorized_projects_ids)
+ projects = projects.where(namespace_id: group.id) if group
+ projects = projects.search(query)
+ project_ids = projects.pluck(:id)
+
+ result[:projects] = projects.limit(20)
+ result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).order('updated_at DESC').limit(20)
+ result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20)
+ result[:total_results] = %w(projects issues merge_requests).sum { |items| result[items.to_sym].size }
+ result
+ end
+
+ def result
+ @result ||= {
+ projects: [],
+ merge_requests: [],
+ issues: [],
+ total_results: 0,
+ }
+ end
+ end
+end
diff --git a/app/contexts/search/project_context.rb b/app/contexts/search/project_context.rb
new file mode 100644
index 00000000000..690652b2cdb
--- /dev/null
+++ b/app/contexts/search/project_context.rb
@@ -0,0 +1,37 @@
+module Search
+ class ProjectContext
+ attr_accessor :project, :current_user, :params
+
+ def initialize(project, user, params)
+ @project, @current_user, @params = project, user, params.dup
+ end
+
+ def execute
+ query = params[:search]
+ query = Shellwords.shellescape(query) if query.present?
+ return result unless query.present?
+
+ if params[:search_code].present?
+ blobs = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
+ blobs = Kaminari.paginate_array(blobs).page(params[:page]).per(20)
+ result[:blobs] = blobs
+ result[:total_results] = blobs.total_count
+ else
+ result[:merge_requests] = project.merge_requests.search(query).order('updated_at DESC').limit(20)
+ result[:issues] = project.issues.search(query).order('updated_at DESC').limit(20)
+ result[:total_results] = %w(issues merge_requests).sum { |items| result[items.to_sym].size }
+ end
+
+ result
+ end
+
+ def result
+ @result ||= {
+ merge_requests: [],
+ issues: [],
+ blobs: [],
+ total_results: 0,
+ }
+ end
+ end
+end
diff --git a/app/contexts/search_context.rb b/app/contexts/search_context.rb
deleted file mode 100644
index 5985ab1fb0c..00000000000
--- a/app/contexts/search_context.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class SearchContext
- attr_accessor :project_ids, :current_user, :params
-
- def initialize(project_ids, user, params)
- @project_ids, @current_user, @params = project_ids, user, params.dup
- end
-
- def execute
- query = params[:search]
- query = Shellwords.shellescape(query) if query.present?
-
- return result unless query.present?
- visibility_levels = @current_user ? [ Gitlab::VisibilityLevel::INTERNAL, Gitlab::VisibilityLevel::PUBLIC ] : [ Gitlab::VisibilityLevel::PUBLIC ]
- result[:projects] = Project.where("projects.id in (?) OR projects.visibility_level in (?)", project_ids, visibility_levels).search(query).limit(20)
-
- # Search inside single project
- single_project_search(Project.where(id: project_ids), query)
- result
- end
-
- def single_project_search(projects, query)
- project = projects.first if projects.length == 1
-
- if params[:search_code].present?
- result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
- else
- result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).order('updated_at DESC').limit(20)
- result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20)
- result[:wiki_pages] = []
- end
- end
-
- def result
- @result ||= {
- projects: [],
- merge_requests: [],
- issues: [],
- wiki_pages: [],
- blobs: []
- }
- end
-end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 407048233e1..ba8f08c5b82 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,33 +1,13 @@
class SearchController < ApplicationController
def show
- project_id = params[:project_id]
- group_id = params[:group_id]
-
- project_ids = find_project_ids(group_id, project_id)
-
- result = SearchContext.new(project_ids, current_user, params).execute
-
- @projects = result[:projects]
- @merge_requests = result[:merge_requests]
- @issues = result[:issues]
- @wiki_pages = result[:wiki_pages]
- @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
-
- private
-
- 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 }
+ @project = Project.find_by_id(params[:project_id]) if params[:project_id].present?
+ @group = Group.find_by_id(params[:group_id]) if params[:group_id].present?
+
+ if @project
+ return access_denied! unless can?(current_user, :download_code, @project)
+ @search_results = Search::ProjectContext.new(@project, current_user, params).execute
+ else
+ @search_results = Search::GlobalContext.new(current_user, params).execute
end
- project_ids
end
end
diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml
index f7a00b23480..979b18e3856 100644
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
@@ -9,7 +9,7 @@
%b.caret
%ul.dropdown-menu
%li
- = link_to search_path(group_id: nil) do
+ = link_to search_path(group_id: nil, search: params[:search]) do
Any
- current_user.authorized_groups.sort_by(&:name).each do |group|
%li
@@ -27,7 +27,7 @@
%b.caret
%ul.dropdown-menu
%li
- = link_to search_path(project_id: nil) do
+ = link_to search_path(project_id: nil, search: params[:search]) do
Any
- current_user.authorized_projects.sort_by(&:name_with_namespace).each do |project|
%li
diff --git a/app/views/search/_global_results.html.haml b/app/views/search/_global_results.html.haml
index 6e6feeb6c5a..7f4f0e5e000 100644
--- a/app/views/search/_global_results.html.haml
+++ b/app/views/search/_global_results.html.haml
@@ -1,5 +1,5 @@
.search_results
%ul.bordered-list
- = render partial: "search/results/project", collection: @projects
- = render partial: "search/results/merge_request", collection: @merge_requests
- = render partial: "search/results/issue", collection: @issues
+ = render partial: "search/results/project", collection: @search_results[:projects]
+ = render partial: "search/results/merge_request", collection: @search_results[:merge_requests]
+ = render partial: "search/results/issue", collection: @search_results[:issues]
diff --git a/app/views/search/_project_results.html.haml b/app/views/search/_project_results.html.haml
index 8d04dd27cca..ea324b3a9aa 100644
--- a/app/views/search/_project_results.html.haml
+++ b/app/views/search/_project_results.html.haml
@@ -1,17 +1,17 @@
-%ul.nav.nav-pills
+%ul.nav.nav-tabs.append-bottom-10
%li{class: ("active" if params[:search_code].present?)}
= link_to search_path(params.merge(search_code: true)) do
Repository Code
%li{class: ("active" if params[:search_code].blank?)}
= link_to search_path(params.merge(search_code: nil)) do
- Everything else
+ Issues and Merge requests
.search_results
- if params[:search_code].present?
.blob-results
- = render partial: "search/results/blob", collection: @blobs
- = paginate @blobs, theme: 'gitlab'
+ = render partial: "search/results/blob", collection: @search_results[:blobs]
+ = paginate @search_results[:blobs], theme: 'gitlab'
- else
%ul.bordered-list
- = render partial: "search/results/merge_request", collection: @merge_requests
- = render partial: "search/results/issue", collection: @issues
+ = render partial: "search/results/merge_request", collection: @search_results[:merge_requests]
+ = render partial: "search/results/issue", collection: @search_results[:issues]
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 75f134aae66..2336d0f71d5 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,7 +1,11 @@
-%fieldset
- %legend
- Search results
- %span.cgray (#{@total_results})
+%h4
+ #{@search_results[:total_results]} results found
+ - if @project
+ for #{link_to @project.name_with_namespace, @project}
+ - elsif @group
+ for #{link_to @group.name, @group}
+
+%hr
- if @project
= render "project_results"
diff --git a/spec/contexts/search_context_spec.rb b/spec/contexts/search_context_spec.rb
index c25743e0032..38a6b55383a 100644
--- a/spec/contexts/search_context_spec.rb
+++ b/spec/contexts/search_context_spec.rb
@@ -1,43 +1,54 @@
require 'spec_helper'
-describe SearchContext do
+describe 'Search::GlobalContext' do
let(:found_namespace) { create(:namespace, name: 'searchable namespace', path:'another_thing') }
let(:user) { create(:user, namespace: found_namespace) }
let!(:found_project) { create(:project, name: 'searchable_project', creator_id: user.id, namespace: found_namespace, visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
let(:unfound_namespace) { create(:namespace, name: 'unfound namespace', path: 'yet_something_else') }
let!(:unfound_project) { create(:project, name: 'unfound_project', creator_id: user.id, namespace: unfound_namespace, visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
-
+
let(:internal_namespace) { create(:namespace, path: 'something_internal',name: 'searchable internal namespace') }
let(:internal_user) { create(:user, namespace: internal_namespace) }
let!(:internal_project) { create(:project, name: 'searchable_internal_project', creator_id: internal_user.id, namespace: internal_namespace, visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
-
+
let(:public_namespace) { create(:namespace, path: 'something_public',name: 'searchable public namespace') }
let(:public_user) { create(:user, namespace: public_namespace) }
let!(:public_project) { create(:project, name: 'searchable_public_project', creator_id: public_user.id, namespace: public_namespace, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
describe '#execute' do
- it 'public projects should be searchable' do
- context = SearchContext.new([found_project.id], nil, {search_code: false, search: "searchable"})
- results = context.execute
- results[:projects].should == [found_project, public_project]
+ context 'unauthenticated' do
+ it 'should return public projects only' do
+ context = Search::GlobalContext.new(nil, search: "searchable")
+ results = context.execute
+ results[:projects].should have(1).items
+ results[:projects].should include(public_project)
+ end
end
- it 'internal projects should be searchable' do
- context = SearchContext.new([found_project.id], user, {search_code: false, search: "searchable"})
- results = context.execute
- # can't seem to rely on the return order, so check this way
- #subject { results[:projects] }
- results[:projects].should have(3).items
- results[:projects].should include(found_project)
- results[:projects].should include(internal_project)
- results[:projects].should include(public_project)
- end
+ context 'authenticated' do
+ it 'should return public, internal and private projects' do
+ context = Search::GlobalContext.new(user, search: "searchable")
+ results = context.execute
+ results[:projects].should have(3).items
+ results[:projects].should include(public_project)
+ results[:projects].should include(found_project)
+ results[:projects].should include(internal_project)
+ end
+
+ it 'should return only public & internal projects' do
+ context = Search::GlobalContext.new(internal_user, search: "searchable")
+ results = context.execute
+ results[:projects].should have(2).items
+ results[:projects].should include(internal_project)
+ results[:projects].should include(public_project)
+ end
- it 'namespace name should be searchable' do
- context = SearchContext.new([found_project.id], user, {search_code: false, search: "searchable namespace"})
- results = context.execute
- results[:projects].should == [found_project]
+ it 'namespace name should be searchable' do
+ context = Search::GlobalContext.new(user, search: "searchable namespace")
+ results = context.execute
+ results[:projects].should == [found_project]
+ end
end
end
end
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
deleted file mode 100644
index 8742789a3b1..00000000000
--- a/spec/controllers/search_controller_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe SearchController do
- let(:project) { create(:project, public: true) }
- let(:user) { create(:user) }
-
- before do
- sign_in(user)
- end
-
- describe '#find_project_ids' do
- it 'should include public projects ids when searching within a single project' do
- project_ids = controller.send(:find_project_ids,nil, project.id)
- project_ids.size.should == 1
- project_ids[0].should == project.id
- end
- end
-end
View Lorry Controller Status