From cca464bce3c2ac43e2759d6a0ab0c977b4098d90 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 May 2023 00:08:42 +0200
Subject: [PATCH] Fix being able to vote on your own polls (#25015)
---
app/validators/vote_validator.rb | 6 +++++-
config/locales/en.yml | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/validators/vote_validator.rb b/app/validators/vote_validator.rb
index b1692562d..4316c59ef 100644
--- a/app/validators/vote_validator.rb
+++ b/app/validators/vote_validator.rb
@@ -3,8 +3,8 @@
class VoteValidator < ActiveModel::Validator
def validate(vote)
vote.errors.add(:base, I18n.t('polls.errors.expired')) if vote.poll.expired?
-
vote.errors.add(:base, I18n.t('polls.errors.invalid_choice')) if invalid_choice?(vote)
+ vote.errors.add(:base, I18n.t('polls.errors.self_vote')) if self_vote?(vote)
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'))
@@ -18,4 +18,8 @@ class VoteValidator < ActiveModel::Validator
def invalid_choice?(vote)
vote.choice.negative? || vote.choice >= vote.poll.options.size
end
+
+ def self_vote?(vote)
+ vote.account_id == vote.poll.account_id
+ end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b1e2a8568..ce20d5d1d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1387,6 +1387,7 @@ en:
expired: The poll has already ended
invalid_choice: The chosen vote option does not exist
over_character_limit: cannot be longer than %{max} characters each
+ self_vote: You cannot vote in your own polls
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items
preferences: