IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: staff members should see all tags

Browse Source
This commit is contained in:
Régis Hanol
2018-05-13 17:50:21 +02:00
parent 2cf6fb7359
commit 37232fcb58
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/tags_controller.rb
View File

@@ -32,22 +32,20 @@ class TagsController < ::ApplicationController
end
format.json do
ungrouped_tags = Tag.where("tags.id NOT IN (select tag_id from tag_group_memberships)")
ungrouped_tags = ungrouped_tags.where("tags.topic_count > 0") unless guardian.can_admin_tags?
if SiteSetting.tags_listed_by_group
grouped_tag_counts = TagGroup.allowed(guardian).order('name ASC').includes(:tags).map do |tag_group|
{ id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags) }
end
ungrouped_tags = Tag.where("tags.id NOT IN (select tag_id from tag_group_memberships) AND tags.topic_count > 0")
render json: {
tags: self.class.tag_counts_json(ungrouped_tags), # tags that don't belong to a group
extras: { tag_groups: grouped_tag_counts }
}
else
unrestricted_tags = DiscourseTagging.filter_visible(
Tag.where("tags.id NOT IN (select tag_id from category_tags) AND tags.topic_count > 0"),
guardian
)
unrestricted_tags = DiscourseTagging.filter_visible(ungrouped_tags, guardian)
categories = Category.where("id in (select category_id from category_tags)")
.where("id in (?)", guardian.allowed_category_ids)