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

FIX: ensures tag-groups are used to allow category edit on topics (#7141)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-03-11 15:02:27 +01:00 committed by GitHub
parent d6eb892b04
commit 7ae1afa7d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/topics_controller.rb
View File

@ -290,7 +290,9 @@ class TopicsController < ApplicationController
end
if category && topic_tags = (params[:tags] || topic.tags.pluck(:name))
allowed_tags = category.tags.pluck(:name)
category_tags = category.tags.pluck(:name)
category_tag_groups = category.tag_groups.joins(:tags).pluck("tags.name")
allowed_tags = (category_tags + category_tag_groups).uniq
if topic_tags.present? && allowed_tags.present?
invalid_tags = topic_tags - allowed_tags

31
spec/requests/topics_controller_spec.rb
View File

@ -1014,15 +1014,17 @@ RSpec.describe TopicsController do
context 'updating to a category with restricted tags' do
let!(:category) { Fabricate(:category) }
let!(:restricted_category) { Fabricate(:category) }
let!(:tag1) { Fabricate(:tag, name: 'tag1') }
let!(:tag2) { Fabricate(:tag, name: 'tag2') }
let!(:tag1) { Fabricate(:tag) }
let!(:tag2) { Fabricate(:tag) }
let!(:tag_group_1) { Fabricate(:tag_group, tag_names: [tag1.name]) }
let!(:tag_group_2) { Fabricate(:tag_group) }
before do
SiteSetting.tagging_enabled = true
topic.update!(tags: [tag1])
end
it 'can change to a category disallowing this topic current tags' do
it 'can’t change to a category disallowing this topic current tags' do
restricted_category.allowed_tags = [tag2.name]
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
@ -1034,9 +1036,30 @@ RSpec.describe TopicsController do
expect(topic.reload.category_id).not_to eq(restricted_category.id)
end
it 'can’t change to a category disallowing this topic current tag (through tag_group)' do
tag_group_2.tags = [tag2]
restricted_category.allowed_tag_groups = [tag_group_2.name]
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
result = ::JSON.parse(response.body)
expect(response.status).to eq(422)
expect(result['errors']).to be_present
expect(topic.reload.category_id).not_to eq(restricted_category.id)
end
it 'can change to a category allowing this topic current tags' do
restricted_category.allowed_tags = [tag1.name]
restricted_category.reload
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
expect(response.status).to eq(200)
end
it 'can change to a category allowing this topic current tags (through tag_group)' do
tag_group_1.tags = [tag1]
restricted_category.allowed_tag_groups = [tag_group_1.name]
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }