From bd8f8ea1f906c749163dbc0ed856446884a3813d Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 10 Nov 2017 15:38:54 -0500
Subject: [PATCH] FIX: don't show Create Topic button on full search page to
users who can't create topics
---
.../discourse/controllers/full-page-search.js.es6 | 6 +++---
app/serializers/grouped_search_result_serializer.rb | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
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 ef661f19289..e4c86c0dcb4 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -159,9 +159,9 @@ export default Ember.Controller.extend({
return this.currentUser && this.currentUser.staff && hasResults;
},
- @computed('expanded')
- canCreateTopic(expanded) {
- return this.currentUser && !this.site.mobileView && !expanded;
+ @computed('expanded', 'model.grouped_search_result.can_create_topic')
+ canCreateTopic(expanded, userCanCreateTopic) {
+ return this.currentUser && userCanCreateTopic && !this.site.mobileView && !expanded;
},
@computed('expanded')
diff --git a/app/serializers/grouped_search_result_serializer.rb b/app/serializers/grouped_search_result_serializer.rb
index 2ce8d6143f9..b9dcb5b62ce 100644
--- a/app/serializers/grouped_search_result_serializer.rb
+++ b/app/serializers/grouped_search_result_serializer.rb
@@ -3,7 +3,7 @@ class GroupedSearchResultSerializer < ApplicationSerializer
has_many :users, serializer: SearchResultUserSerializer
has_many :categories, serializer: BasicCategorySerializer
has_many :tags, serializer: TagSerializer
- attributes :more_posts, :more_users, :more_categories, :term, :search_log_id, :more_full_page_results
+ attributes :more_posts, :more_users, :more_categories, :term, :search_log_id, :more_full_page_results, :can_create_topic
def search_log_id
object.search_log_id
@@ -17,4 +17,8 @@ class GroupedSearchResultSerializer < ApplicationSerializer
SiteSetting.tagging_enabled
end
+ def can_create_topic
+ scope.can_create?(Topic)
+ end
+
end