github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: enforce tagging on categories

Browse Source
This commit is contained in:
Arpit Jalan
2018-03-29 00:10:26 +05:30
parent abf0b1c5bd
commit 9ca6ebe8fe
17 changed files with 209 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/topic_creator.rb
View File

@ -24,11 +24,6 @@ class TopicCreator
# this allows us to add errors
valid = topic.valid?
# not sure where this should go
if !@guardian.is_staff? && staff_only = DiscourseTagging.staff_only_tags(@opts[:tags])
topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_only.join(" "))
end
DiscourseEvent.trigger(:after_validate_topic, topic, self)
valid &&= topic.errors.empty?
@ -159,7 +154,19 @@ class TopicCreator
end
def setup_tags(topic)
DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
if @opts[:tags].blank?
unless @guardian.is_staff?
# Validate minimum required tags for a category
category = find_category
if category.present? && category.minimum_required_tags > 0
topic.errors[:base] << I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags)
rollback_from_errors!(topic)
end
end
else
valid_tags = DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
rollback_from_errors!(topic) unless valid_tags
end
end
def setup_auto_close_time(topic)