diff options
| author | Hinaloe <hina@hinaloe.net> | 2019-04-10 00:02:12 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-09 17:02:12 +0200 |
| commit | 48f466daf1498173cf6ec36db58562df9a031297 (patch) | |
| tree | 999337558faab8f10731840d0587f5a3dfa41255 /app/validators | |
| parent | 8b69a66380bbe32127e717ca2d79244392b7d2b6 (diff) | |
Allow set the voting period to just 5 minutes (#10525)
* Add spec of PollValidator for #10190 * Raise fraction less than 1 second * format * simplify time initialize
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/poll_validator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb index fd497c8d0..9d7321cad 100644 --- a/app/validators/poll_validator.rb +++ b/app/validators/poll_validator.rb @@ -14,6 +14,6 @@ class PollValidator < ActiveModel::Validator 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_short')) if poll.expires_at.present? && (poll.expires_at - current_time).ceil < MIN_EXPIRATION end end |