Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: max_tags_per_topic should not limit how many tags can be in a group

This commit is contained in:
Neil Lalonde 2016-06-09 16:32:19 -04:00
parent a6090339a7
commit addf4822e3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/tag_group.rb
View File

@ -9,7 +9,7 @@ class TagGroup < ActiveRecord::Base
belongs_to :parent_tag, class_name: 'Tag' belongs_to :parent_tag, class_name: 'Tag'
def tag_names=(tag_names_arg) def tag_names=(tag_names_arg)
DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg) DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
end end
def parent_tag_name=(tag_names_arg) def parent_tag_name=(tag_names_arg)

8
lib/discourse_tagging.rb
View File

@ -166,7 +166,7 @@ module DiscourseTagging
tag_diff.present? ? tag_diff : nil tag_diff.present? ? tag_diff : nil
end end
def self.tags_for_saving(tags, guardian) def self.tags_for_saving(tags, guardian, opts={})
return [] unless guardian.can_tag_topics? return [] unless guardian.can_tag_topics?
@ -181,11 +181,11 @@ module DiscourseTagging
tag_names = Tag.where(name: tag_names).pluck(:name) tag_names = Tag.where(name: tag_names).pluck(:name)
end end
return tag_names[0...SiteSetting.max_tags_per_topic] return opts[:unlimited] ? tag_names : tag_names[0...SiteSetting.max_tags_per_topic]
end end
def self.add_or_create_tags_by_name(taggable, tag_names_arg) def self.add_or_create_tags_by_name(taggable, tag_names_arg, opts={})
tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user)) || [] tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user), opts) || []
if taggable.tags.pluck(:name).sort != tag_names.sort if taggable.tags.pluck(:name).sort != tag_names.sort
taggable.tags = Tag.where(name: tag_names).all taggable.tags = Tag.where(name: tag_names).all
if taggable.tags.size < tag_names.size if taggable.tags.size < tag_names.size