Commit 9487c370 authored by Hannes Rosenögger's avatar Hannes Rosenögger

Only trigger actual search if a search string is present

parent 6c1074e3
No related merge requests found
...@@ -2,34 +2,34 @@ class SearchController < ApplicationController ...@@ -2,34 +2,34 @@ class SearchController < ApplicationController
include SearchHelper include SearchHelper
def show def show
return if params[:search].nil? || params[:search].blank?
@project = Project.find_by(id: params[:project_id]) if params[:project_id].present? @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? @group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
@scope = params[:scope] @scope = params[:scope]
@show_snippets = params[:snippets].eql? 'true' @show_snippets = params[:snippets].eql? 'true'
@search_results = if @project @search_results =
return access_denied! unless can?(current_user, :download_code, @project) if @project
return access_denied! unless can?(current_user, :download_code, @project)
unless %w(blobs notes issues merge_requests wiki_blobs).
include?(@scope) unless %w(blobs notes issues merge_requests wiki_blobs).
@scope = 'blobs' include?(@scope)
end @scope = 'blobs'
end
Search::ProjectService.new(@project, current_user, params).execute
elsif @show_snippets Search::ProjectService.new(@project, current_user, params).execute
unless %w(snippet_blobs snippet_titles).include?(@scope) elsif @show_snippets
@scope = 'snippet_blobs' unless %w(snippet_blobs snippet_titles).include?(@scope)
end @scope = 'snippet_blobs'
end
Search::SnippetService.new(current_user, params).execute
else Search::SnippetService.new(current_user, params).execute
unless %w(projects issues merge_requests).include?(@scope) else
@scope = 'projects' unless %w(projects issues merge_requests).include?(@scope)
end @scope = 'projects'
end
Search::GlobalService.new(current_user, params).execute Search::GlobalService.new(current_user, params).execute
end end
@objects = @search_results.objects(@scope, params[:page]) @objects = @search_results.objects(@scope, params[:page])
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment