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

FEATURE: Allow single option polls (#8853)

Browse Source
This commit is contained in:
Mark VanLandingham
2020-02-05 08:03:27 -06:00
committed by GitHub
parent 53529a3427
commit 5d97286fa7
7 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ module DiscoursePoll
return false unless unique_poll_name?(polls, poll)
return false unless unique_options?(poll)
return false unless any_blank_options?(poll)
return false unless at_least_two_options?(poll)
return false unless at_least_one_option?(poll)
return false unless valid_number_of_options?(poll)
return false unless valid_multiple_choice_settings?(poll)
polls[poll["name"]] = poll
@ -92,12 +92,12 @@ module DiscoursePoll
true
end
def at_least_two_options?(poll)
if poll["options"].size < 2
def at_least_one_option?(poll)
if poll["options"].size < 1
if poll["name"] == ::DiscoursePoll::DEFAULT_POLL_NAME
@post.errors.add(:base, I18n.t("poll.default_poll_must_have_at_least_2_options"))
@post.errors.add(:base, I18n.t("poll.default_poll_must_have_at_least_1_option"))
else
@post.errors.add(:base, I18n.t("poll.named_poll_must_have_at_least_2_options", name: poll["name"]))
@post.errors.add(:base, I18n.t("poll.named_poll_must_have_at_least_1_option", name: poll["name"]))
end
return false
@ -170,9 +170,9 @@ module DiscoursePoll
valid = false
elsif ((max - min + 1) / step) < 2
if poll["name"] == ::DiscoursePoll::DEFAULT_POLL_NAME
@post.errors.add(:base, I18n.t("poll.default_poll_must_have_at_least_2_options"))
@post.errors.add(:base, I18n.t("poll.default_poll_must_have_at_least_1_option"))
else
@post.errors.add(:base, I18n.t("poll.named_poll_must_have_at_least_2_options", name: poll["name"]))
@post.errors.add(:base, I18n.t("poll.named_poll_must_have_at_least_1_option", name: poll["name"]))
end
valid = false
end