lock_access! better failure message

2026-04-28 03:00:29 -04:00 · 2014-05-16 05:57:18 +08:00
parent 2f6edfd0c5
commit d8ee3e49cb
2 changed files with 12 additions and 2 deletions
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -115,10 +115,10 @@ module Devise
        # leaks the existence of an account.
        if Devise.paranoid
          super
+        elsif access_locked? || (lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?)
+          :locked
        elsif lock_strategy_enabled?(:failed_attempts) && last_attempt?
          :last_attempt
-        elsif lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?
-          :locked
        else
          super
        end