Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Allow set the voting period to just 5 minutes (#10525)

Browse source 
* Add spec of PollValidator for #10190

* Raise fraction less than 1 second

* format

* simplify time initialize
This commit is contained in:
Hinaloe 2019-04-10 00:02:12 +09:00 • committed by Eugen Rochko
parent 8b69a66380
commit 48f466daf1
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/validators/poll_validator.rb
View file

@ -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