mirror of
https://github.com/wassname/flask-security.git
synced 2026-06-27 16:10:11 +08:00
Merge pull request #438 from jonafato/is_active-fix
Fix use of is_active for Flask-Login>=0.3.0
This commit is contained in:
@@ -305,6 +305,7 @@ class RoleMixin(object):
|
||||
class UserMixin(BaseUserMixin):
|
||||
"""Mixin for `User` model definitions"""
|
||||
|
||||
@property
|
||||
def is_active(self):
|
||||
"""Returns `True` if the user is active."""
|
||||
return self.active
|
||||
|
||||
@@ -195,7 +195,7 @@ class PasswordlessLoginForm(Form, UserEmailFormMixin):
|
||||
def validate(self):
|
||||
if not super(PasswordlessLoginForm, self).validate():
|
||||
return False
|
||||
if not self.user.is_active():
|
||||
if not self.user.is_active:
|
||||
self.email.errors.append(get_message('DISABLED_ACCOUNT')[0])
|
||||
return False
|
||||
return True
|
||||
@@ -241,7 +241,7 @@ class LoginForm(Form, NextFormMixin):
|
||||
if requires_confirmation(self.user):
|
||||
self.email.errors.append(get_message('CONFIRMATION_REQUIRED')[0])
|
||||
return False
|
||||
if not self.user.is_active():
|
||||
if not self.user.is_active:
|
||||
self.email.errors.append(get_message('DISABLED_ACCOUNT')[0])
|
||||
return False
|
||||
return True
|
||||
|
||||
Reference in New Issue
Block a user