mirror of
https://github.com/discourse/discourse.git
synced 2025-05-21 18:12:32 +08:00
Add rubocop to our build. (#5004)
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
class AllowUserLocaleEnabledValidator
|
||||
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
@ -15,4 +15,4 @@ class AllowUserLocaleEnabledValidator
|
||||
I18n.t("site_settings.errors.user_locale_not_enabled");
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
@ -1,5 +1,5 @@
|
||||
class AlternativeReplyByEmailAddressesValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
class EmailSettingValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
class IntegerSettingValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
@opts[:min] = 0 unless @opts[:min].present? || @opts[:hidden]
|
||||
@opts[:max] = 20000 unless @opts[:max].present? || @opts[:hidden]
|
||||
@ -7,18 +7,18 @@ class IntegerSettingValidator
|
||||
|
||||
def valid_value?(val)
|
||||
return false if val.to_i.to_s != val.to_s
|
||||
return false if @opts[:min] and @opts[:min].to_i > val.to_i
|
||||
return false if @opts[:max] and @opts[:max].to_i < val.to_i
|
||||
return false if @opts[:min] && @opts[:min].to_i > (val.to_i)
|
||||
return false if @opts[:max] && @opts[:max].to_i < (val.to_i)
|
||||
true
|
||||
end
|
||||
|
||||
def error_message
|
||||
if @opts[:min] && @opts[:max]
|
||||
I18n.t('site_settings.errors.invalid_integer_min_max', {min: @opts[:min], max: @opts[:max]})
|
||||
I18n.t('site_settings.errors.invalid_integer_min_max', min: @opts[:min], max: @opts[:max])
|
||||
elsif @opts[:min]
|
||||
I18n.t('site_settings.errors.invalid_integer_min', {min: @opts[:min]})
|
||||
I18n.t('site_settings.errors.invalid_integer_min', min: @opts[:min])
|
||||
elsif @opts[:max]
|
||||
I18n.t('site_settings.errors.invalid_integer_max', {max: @opts[:max]})
|
||||
I18n.t('site_settings.errors.invalid_integer_max', max: @opts[:max])
|
||||
else
|
||||
I18n.t('site_settings.errors.invalid_integer')
|
||||
end
|
||||
|
@ -2,7 +2,7 @@ require "net/pop"
|
||||
|
||||
class POP3PollingEnabledSettingValidator
|
||||
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -24,7 +24,7 @@ class Validators::PostValidator < ActiveModel::Validator
|
||||
post.errors.add(:topic_id, :blank, options) if post.topic_id.blank?
|
||||
end
|
||||
|
||||
if post.new_record? and post.user_id.nil?
|
||||
if post.new_record? && post.user_id.nil?
|
||||
post.errors.add(:user_id, :blank, options)
|
||||
end
|
||||
end
|
||||
|
@ -2,7 +2,7 @@ class RegexSettingValidator
|
||||
|
||||
LOREM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam eget sem non elit tincidunt rhoncus.'.freeze
|
||||
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
class ReplyByEmailAddressValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
class ReplyByEmailEnabledValidator
|
||||
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
class SsoOverridesEmailValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
class StringSettingValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
@regex = Regexp.new(opts[:regex]) if opts[:regex]
|
||||
@regex_error = opts[:regex_error] || 'site_settings.errors.regex_mismatch'
|
||||
@ -8,12 +8,12 @@ class StringSettingValidator
|
||||
def valid_value?(val)
|
||||
return true if !val.present?
|
||||
|
||||
if (@opts[:min] and @opts[:min].to_i > val.length) || (@opts[:max] and @opts[:max].to_i < val.length)
|
||||
if (@opts[:min] && @opts[:min].to_i > (val.length)) || (@opts[:max] && @opts[:max].to_i < (val.length))
|
||||
@length_fail = true
|
||||
return false
|
||||
end
|
||||
|
||||
if @regex and !(val =~ @regex)
|
||||
if @regex && !(val =~ @regex)
|
||||
@regex_fail = true
|
||||
return false
|
||||
end
|
||||
@ -26,11 +26,11 @@ class StringSettingValidator
|
||||
I18n.t(@regex_error)
|
||||
elsif @length_fail
|
||||
if @opts[:min] && @opts[:max]
|
||||
I18n.t('site_settings.errors.invalid_string_min_max', {min: @opts[:min], max: @opts[:max]})
|
||||
I18n.t('site_settings.errors.invalid_string_min_max', min: @opts[:min], max: @opts[:max])
|
||||
elsif @opts[:min]
|
||||
I18n.t('site_settings.errors.invalid_string_min', {min: @opts[:min]})
|
||||
I18n.t('site_settings.errors.invalid_string_min', min: @opts[:min])
|
||||
else
|
||||
I18n.t('site_settings.errors.invalid_string_max', {max: @opts[:max]})
|
||||
I18n.t('site_settings.errors.invalid_string_max', max: @opts[:max])
|
||||
end
|
||||
else
|
||||
I18n.t('site_settings.errors.invalid_string')
|
||||
|
@ -7,15 +7,16 @@ class TopicTitleLengthValidator < ActiveModel::EachValidator
|
||||
private
|
||||
|
||||
def title_validator(record)
|
||||
length_range = if record.user.try(:admin?)
|
||||
1..SiteSetting.max_topic_title_length
|
||||
elsif record.private_message?
|
||||
SiteSetting.private_message_title_length
|
||||
else
|
||||
SiteSetting.topic_title_length
|
||||
end
|
||||
length_range =
|
||||
if record.user.try(:admin?)
|
||||
1..SiteSetting.max_topic_title_length
|
||||
elsif record.private_message?
|
||||
SiteSetting.private_message_title_length
|
||||
else
|
||||
SiteSetting.topic_title_length
|
||||
end
|
||||
|
||||
ActiveModel::Validations::LengthValidator.new({attributes: :title, in: length_range, allow_blank: true})
|
||||
ActiveModel::Validations::LengthValidator.new(attributes: :title, in: length_range, allow_blank: true)
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -1,5 +1,5 @@
|
||||
class UsernameSettingValidator
|
||||
def initialize(opts={})
|
||||
def initialize(opts = {})
|
||||
@opts = opts
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user