Use wiki partial in search results
This commit is contained in:
parent
8b2592ee74
commit
d60d50d6ba
3 changed files with 31 additions and 3 deletions
|
@ -21,10 +21,9 @@
|
|||
- if @scope == 'projects'
|
||||
.term
|
||||
= render 'shared/projects/list', projects: @search_objects, pipeline_status: false
|
||||
- elsif %w[blobs wiki_blobs].include?(@scope)
|
||||
= render partial: 'search/results/blob', collection: @search_objects, locals: { projects: blob_projects(@search_objects) }
|
||||
- else
|
||||
= render partial: "search/results/#{@scope.singularize}", collection: @search_objects
|
||||
- locals = { projects: blob_projects(@search_objects) } if %w[blobs wiki_blobs].include?(@scope)
|
||||
= render partial: "search/results/#{@scope.singularize}", collection: @search_objects, locals: locals
|
||||
|
||||
- if @scope != 'projects'
|
||||
= paginate_collection(@search_objects)
|
||||
|
|
5
changelogs/unreleased/60906-fix-wiki-links.yml
Normal file
5
changelogs/unreleased/60906-fix-wiki-links.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Show proper wiki links in search results
|
||||
merge_request: 27634
|
||||
author:
|
||||
type: fixed
|
|
@ -11,6 +11,30 @@ describe SearchController do
|
|||
sign_in(user)
|
||||
end
|
||||
|
||||
context 'uses the right partials depending on scope' do
|
||||
using RSpec::Parameterized::TableSyntax
|
||||
render_views
|
||||
|
||||
set(:project) { create(:project, :public, :repository, :wiki_repo) }
|
||||
|
||||
subject { get(:show, params: { project_id: project.id, scope: scope, search: 'merge' }) }
|
||||
|
||||
where(:partial, :scope) do
|
||||
'_blob' | :blobs
|
||||
'_wiki_blob' | :wiki_blobs
|
||||
'_commit' | :commits
|
||||
end
|
||||
|
||||
with_them do
|
||||
it do
|
||||
project_wiki = create(:project_wiki, project: project, user: user)
|
||||
create(:wiki_page, wiki: project_wiki, attrs: { title: 'merge', content: 'merge' })
|
||||
|
||||
expect(subject).to render_template("search/results/#{partial}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
it 'finds issue comments' do
|
||||
project = create(:project, :public)
|
||||
note = create(:note_on_issue, project: project)
|
||||
|
|
Loading…
Reference in a new issue