diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-06 04:54:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-06 04:54:11 +0100 |
commit | 5996be994d7a27ffb5075d663acf02dddc32ea7e (patch) | |
tree | 6223a11e993f313f9d28452826d5c87bfb05f13f /app | |
parent | d97cbb0da60f32c9e7e60445af329173b0df1aa7 (diff) |
Fix poll validation issues (#10186)
- Fix missing interpolation argument in PollValidator - Fix PollValidator rejecting exact allowed min/max durations
Diffstat (limited to 'app')
-rw-r--r-- | app/validators/poll_validator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb index d4ae4c16a..fd497c8d0 100644 --- a/app/validators/poll_validator.rb +++ b/app/validators/poll_validator.rb @@ -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 |