Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
5cd55d8a
Unverified
Commit
5cd55d8a
authored
1 year ago
by
Claire
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix being able to vote on your own polls (#25015)
parent
bec6a1ca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/validators/vote_validator.rb
+5
-1
5 additions, 1 deletion
app/validators/vote_validator.rb
config/locales/en.yml
+1
-0
1 addition, 0 deletions
config/locales/en.yml
with
6 additions
and
1 deletion
app/validators/vote_validator.rb
+
5
−
1
View file @
5cd55d8a
...
...
@@ -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
)
vote
.
errors
.
add
(
:base
,
I18n
.
t
(
'polls.errors.already_voted'
))
if
additional_voting_not_allowed?
(
vote
)
end
...
...
@@ -27,6 +27,10 @@ class VoteValidator < ActiveModel::Validator
vote
.
choice
.
negative?
||
vote
.
choice
>=
vote
.
poll
.
options
.
size
end
def
self_vote?
(
vote
)
vote
.
account_id
==
vote
.
poll
.
account_id
end
def
already_voted_for_same_choice_on_multiple_poll?
(
vote
)
if
vote
.
persisted?
account_votes_on_same_poll
(
vote
).
where
(
choice:
vote
.
choice
).
where
.
not
(
poll_votes:
{
id:
vote
}).
exists?
...
...
This diff is collapsed.
Click to expand it.
config/locales/en.yml
+
1
−
0
View file @
5cd55d8a
...
...
@@ -1446,6 +1446,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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment