Merge pull request #5036 from consul/author_lock

Simplify locking current user when voting
2022-12-12 11:47:30 +01:00
parent 5cbf4f1766 4355138f57
commit bc716f6726
2 changed files with 1 additions and 2 deletions
--- a/app/models/poll/answer.rb
+++ b/app/models/poll/answer.rb
@@ -38,7 +38,6 @@ class Poll::Answer < ApplicationRecord
    def max_votes
      return if !question || question&.unique? || persisted?

-      author.reload
      author.lock!

      if question.answers.by_author(author).count >= question.max_votes
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -339,7 +339,7 @@ class User < ApplicationRecord
  end

  def locale
-    self[:locale] ||= I18n.default_locale.to_s
+    self[:locale] || I18n.default_locale.to_s
  end

  def confirmation_required?