From 277e216d25321f7fdb3dbb7372b679fd31203671 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 29 May 2018 12:30:23 +0530 Subject: [PATCH] FIX: link to pm tags when searching in personal messages --- .../discourse/controllers/full-page-search.js.es6 | 5 +++++ .../javascripts/discourse/templates/full-page-search.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 index 0273b7eaca1..5534be1f99c 100644 --- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -146,6 +146,11 @@ export default Ember.Controller.extend({ } }, + @computed('q') + isPrivateMessage(q) { + return q && this.currentUser && (q.indexOf("in:private") > -1 || q.indexOf(`private_messages:${this.currentUser.get('username_lower')}`) > -1); + }, + @observes('loading') _showFooter() { this.set("application.showFooter", !this.get("loading")); diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index 68d28691839..346b3836645 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -85,7 +85,7 @@ {{/if}} {{category-link result.topic.category hideParent=true}} {{#each result.topic.tags as |tag|}} - {{discourse-tag tag}} + {{discourse-tag tag isPrivateMessage=isPrivateMessage}} {{/each}} {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}