Skip to content
Snippets Groups Projects

[EE] Add users search results to global search

Merged Jan Provaznik requested to merge ee-users-search-results into master
All threads resolved!
2 files
+ 8
1
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -29,6 +29,7 @@ def show
@@ -29,6 +29,7 @@ def show
@search_objects = search_service.search_objects
@search_objects = search_service.search_objects
render_commits if @scope == 'commits'
render_commits if @scope == 'commits'
 
eager_load_user_status if @scope == 'users'
check_single_commit_result
check_single_commit_result
end
end
@@ -54,6 +55,10 @@ def render_commits
@@ -54,6 +55,10 @@ def render_commits
@search_objects = prepare_commits_for_rendering(@search_objects)
@search_objects = prepare_commits_for_rendering(@search_objects)
end
end
 
def eager_load_user_status
 
@search_objects = @search_objects.eager_load(:status) # rubocop:disable CodeReuse/ActiveRecord
 
end
 
def check_single_commit_result
def check_single_commit_result
if @search_results.single_commit_result?
if @search_results.single_commit_result?
only_commit = @search_results.objects('commits').first
only_commit = @search_results.objects('commits').first
Loading