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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/discourse_tagging.rb
View File

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