github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 11:11:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: min setting should be greater than 0 for multiple type polls.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-06-07 10:48:06 +08:00
parent cc66bff730
commit 2f14a81fa4
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/poll/lib/polls_validator.rb
View File

@ -92,10 +92,11 @@ module DiscoursePoll
def valid_multiple_choice_settings?(poll)
if poll["type"] == "multiple"
num_of_options = poll["options"].size
min = (poll["min"].presence || 1).to_i
max = (poll["max"].presence || poll["options"].size).to_i
max = (poll["max"].presence || num_of_options).to_i
if min > max || max <= 0 || max > poll["options"].size || min >= poll["options"].size
if min > max || min <= 0 || max <= 0 || max > num_of_options || min >= num_of_options
if poll["name"] == ::DiscoursePoll::DEFAULT_POLL_NAME
@post.errors.add(:base, I18n.t("poll.default_poll_with_multiple_choices_has_invalid_parameters"))
else