github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-15 19:23:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: when allow uncategorized was off we were still showing uncat for admins/mods

Browse Source
This commit is contained in:
Sam 2015-02-20 17:30:31 +11:00
parent b6bbf36c03
commit e8ca1f9818
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/views/topic.js.es6
View File

@ -126,7 +126,7 @@ var TopicView = Discourse.View.extend(AddCategoryClass, Discourse.Scrolling, {
var opts = { latestLink: "<a href=\"" + Discourse.getURL("/latest") + "\">" + I18n.t("topic.view_latest_topics") + "</a>" },
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;
}

7
app/models/site.rb
View File

@ -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))