Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: No need to highlight search if PG headline generation is used.

This commit is contained in:
Guo Xiang Tan 2020-08-07 10:49:37 +08:00
parent 12a00d6dc5
commit 1d2ba8fd52
No known key found for this signature in database
GPG Key ID: FBD110179AAC1F20
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/search-logs-term.hbs
View File

@ -54,10 +54,14 @@
</span> </span>
{{#if result.blurb}} {{#if result.blurb}}
{{#highlight-search highlight=term}} {{#if siteSettings.use_pg_headlines_for_excerpt}}
{{html-safe result.blurb}}
{{else}}
{{#highlight-search highlight=highlightQuery}}
{{html-safe result.blurb}} {{html-safe result.blurb}}
{{/highlight-search}} {{/highlight-search}}
{{/if}} {{/if}}
{{/if}}
</div> </div>
</div> </div>
</div> </div>

4
app/assets/javascripts/discourse/app/templates/full-page-search.hbs
View File

@ -112,10 +112,14 @@
</span> </span>
{{#if result.blurb}} {{#if result.blurb}}
{{#if siteSettings.use_pg_headlines_for_excerpt}}
{{html-safe result.blurb}}
{{else}}
{{#highlight-search highlight=highlightQuery}} {{#highlight-search highlight=highlightQuery}}
{{html-safe result.blurb}} {{html-safe result.blurb}}
{{/highlight-search}} {{/highlight-search}}
{{/if}} {{/if}}
{{/if}}
</div> </div>
{{#if showLikeCount}} {{#if showLikeCount}}