From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 3 Mar 2019 22:41:30 +0000 (+0100)
Subject: Fix vote validation for polls with multiple choices (#10138)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8fe93b0701ea754fe8727b1d4ef11f7a33903f81;p=mastodon.git

Fix vote validation for polls with multiple choices (#10138)
---

diff --git a/app/validators/vote_validator.rb b/app/validators/vote_validator.rb
index e2a68d1f3..2e1818bdb 100644
--- a/app/validators/vote_validator.rb
+++ b/app/validators/vote_validator.rb
@@ -6,7 +6,7 @@ class VoteValidator < ActiveModel::Validator
 
     if vote.poll.multiple? && vote.poll.votes.where(account: vote.account, choice: vote.choice).exists?
       vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
-    elsif vote.poll.votes.where(account: vote.account).exists?
+    elsif !vote.poll.multiple? && vote.poll.votes.where(account: vote.account).exists?
       vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
     end
   end