From bd61cdf21c7348eeaf4246eb91889f2b7f644a1c Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 20 Feb 2015 17:30:31 +1100 Subject: [PATCH] FIX: when allow uncategorized was off we were still showing uncat for admins/mods --- app/assets/javascripts/discourse/views/topic.js.es6 | 2 +- app/models/site.rb | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 772291a5134..758a8a06e10 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -126,7 +126,7 @@ var TopicView = Discourse.View.extend(AddCategoryClass, Discourse.Scrolling, { var opts = { latestLink: "" + I18n.t("topic.view_latest_topics") + "" }, category = this.get('controller.content.category'); - if(Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id")) { + if(category && Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id")) { category = null; } diff --git a/app/models/site.rb b/app/models/site.rb index bfe31fb6e76..4d3c1590515 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -43,7 +43,12 @@ class Site .secured(@guardian) .includes(:topic_only_relative_url) .order(:position) - .to_a + + unless SiteSetting.allow_uncategorized_topics + categories = categories.where('categories.id <> ?', SiteSetting.uncategorized_category_id) + end + + categories = categories.to_a allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))