From 8005709997022b80917d5172ef8cd01686a4832d Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 3 Nov 2015 13:36:34 -0500 Subject: [PATCH] Fix use of is_active for Flask-Login>=0.3.0 --- flask_security/core.py | 1 + flask_security/forms.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flask_security/core.py b/flask_security/core.py index b1c0cae..eec3092 100644 --- a/flask_security/core.py +++ b/flask_security/core.py @@ -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 diff --git a/flask_security/forms.py b/flask_security/forms.py index 62bbfda..8303343 100644 --- a/flask_security/forms.py +++ b/flask_security/forms.py @@ -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