github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Error when voting on a multiple poll without the min/max attrs.

Browse Source
This commit is contained in:
Alan Guo Xiang Tan
2022-01-05 09:50:49 +08:00
parent 4134c9b478
commit 21822cf0b7
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/poll/lib/poll.rb
View File

@ -38,7 +38,10 @@ class DiscoursePoll::Poll
# Ensure consistency here as we do not have a unique index to limit the
# number of votes per the poll's configuration.
DB.query(<<~SQL, poll_id: poll_id, user_id: user.id, offset: serialized_poll[:type] == "multiple" ? serialized_poll[:max] : 1)
is_multiple = serialized_poll[:type] == "multiple"
offset = is_multiple ? (serialized_poll[:max] || serialized_poll[:options].length) : 1
DB.query(<<~SQL, poll_id: poll_id, user_id: user.id, offset: offset)
DELETE FROM poll_votes
USING (
SELECT
@ -315,12 +318,12 @@ class DiscoursePoll::Poll
num_of_options = options.length
if poll.multiple?
if num_of_options < poll.min
if poll.min && (num_of_options < poll.min)
raise DiscoursePoll::Error.new(I18n.t(
"poll.min_vote_per_user",
count: poll.min
))
elsif num_of_options > poll.max
elsif poll.max && (num_of_options > poll.max)
raise DiscoursePoll::Error.new(I18n.t(
"poll.max_vote_per_user",
count: poll.max