github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 15:06:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: include new tags in validation if user can create one. (#14744)

Browse Source 
Previously, users who have enough trust level are unable to create topics with new tags if the selected category required a minimum number of tags.
This commit is contained in:
Vinoth Kannan 2021-10-28 11:59:46 +05:30 committed by GitHub
parent b659e94a8e
commit a2851b5d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/topic_creator.rb
View File

@ -26,11 +26,13 @@ class TopicCreator
category = find_category
if category.present? && guardian.can_tag?(topic)
tags = @opts[:tags].present? ? Tag.where(name: @opts[:tags]) : (@opts[:tags] || [])
tags = @opts[:tags].presence || []
existing_tags = tags.present? ? Tag.where(name: tags) : []
valid_tags = guardian.can_create_tag? ? tags : existing_tags
# both add to topic.errors
DiscourseTagging.validate_min_required_tags_for_category(guardian, topic, category, tags)
DiscourseTagging.validate_required_tags_from_group(guardian, topic, category, tags)
DiscourseTagging.validate_min_required_tags_for_category(guardian, topic, category, valid_tags)
DiscourseTagging.validate_required_tags_from_group(guardian, topic, category, existing_tags)
end
DiscourseEvent.trigger(:after_validate_topic, topic, self)

6
spec/components/topic_creator_spec.rb
View File

@ -140,6 +140,12 @@ describe TopicCreator do
expect(topic.tags.length).to eq(2)
end
it "minimum_required_tags is satisfying for new tags if user can create" do
topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: ["new tag", "another tag"], category: category.id))
expect(topic).to be_valid
expect(topic.tags.length).to eq(2)
end
it "lets new user create a topic if they don't have sufficient trust level to tag topics" do
SiteSetting.min_trust_level_to_tag_topics = 1
new_user = Fabricate(:newuser)