diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-06 12:20:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 12:20:17 +0100 |
| commit | fefacb7b7a21fc4aa40cb18ac797ecb5c44627f6 (patch) | |
| tree | 7c4dbacf4603fd834da1bf8645b894634da06d4f /app/validators | |
| parent | e80fabfd84c1e2d157ca1cd536f68f3c75f011c1 (diff) | |
| parent | 94a0149ff3e455792050e790d397d1d4d2c2d851 (diff) | |
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/validators')
| -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 |