Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

FIX: removing a default category wasn't working

Browse source
This commit is contained in:
Régis Hanol 2015-08-26 22:40:16 +02:00
parent 5457684975
commit 4ba89eec27
2 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/site_setting_extension.rb
View file

@ -336,7 +336,7 @@ module SiteSettingExtension
valid = false unless value.to_i.is_a?(Fixnum) valid = false unless value.to_i.is_a?(Fixnum)
end end
return valid valid
end end
def filter_value(name, value) def filter_value(name, value)

33
lib/site_setting_validations.rb
View file

@ -15,12 +15,35 @@ module SiteSettingValidations
validate_error :max_username_length_exists if User.where('length(username) > ?', new_val).exists? validate_error :max_username_length_exists if User.where('length(username) > ?', new_val).exists?
end end
def validate_default_categories(new_val) def validate_default_categories(new_val, default_categories_selected)
validate_error :default_categories_already_selected if (new_val.split("|").to_set & SiteSetting.default_categories_selected).size > 0 validate_error :default_categories_already_selected if (new_val.split("|").to_set & default_categories_selected).size > 0
end end
alias_method :validate_default_categories_watching, :validate_default_categories def validate_default_categories_watching(new_val)
alias_method :validate_default_categories_tracking, :validate_default_categories default_categories_selected = [
alias_method :validate_default_categories_muted, :validate_default_categories SiteSetting.default_categories_tracking.split("|"),
SiteSetting.default_categories_muted.split("|"),
].flatten.to_set
validate_default_categories(new_val, default_categories_selected)
end
def validate_default_categories_tracking(new_val)
default_categories_selected = [
SiteSetting.default_categories_watching.split("|"),
SiteSetting.default_categories_muted.split("|"),
].flatten.to_set
validate_default_categories(new_val, default_categories_selected)
end
def validate_default_categories_muted(new_val)
default_categories_selected = [
SiteSetting.default_categories_watching.split("|"),
SiteSetting.default_categories_tracking.split("|"),
].flatten.to_set
validate_default_categories(new_val, default_categories_selected)
end
end end