Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix poll validation issues (#10186)

Browse source 
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
This commit is contained in:
Eugen Rochko 2019-03-06 04:54:11 +01:00 • committed by GitHub
parent d97cbb0da6
commit 5996be994d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/validators/poll_validator.rb
View file

@ -13,7 +13,7 @@ class PollValidator < ActiveModel::Validator
poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS
poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS }
poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time >= MAX_EXPIRATION
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && poll.expires_at - current_time <= MIN_EXPIRATION
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time > MAX_EXPIRATION
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && poll.expires_at - current_time < MIN_EXPIRATION
end
end