From 300f3731151c1c52303606a5ae55622e7536129b Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 1 Mar 2016 23:04:32 +0100 Subject: fix --- migrations/versions/2472eddbf44b_update_of_the_user_model.py | 1 - src/web/forms.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/migrations/versions/2472eddbf44b_update_of_the_user_model.py b/migrations/versions/2472eddbf44b_update_of_the_user_model.py index e0974015..a0194090 100644 --- a/migrations/versions/2472eddbf44b_update_of_the_user_model.py +++ b/migrations/versions/2472eddbf44b_update_of_the_user_model.py @@ -17,7 +17,6 @@ import sqlalchemy as sa def upgrade(): - op.drop_column('user', 'roles') op.drop_column('user', 'enabled') op.add_column('user', sa.Column('is_active', sa.Boolean(), default=False)) op.add_column('user', sa.Column('is_admin', sa.Boolean(), default=False)) diff --git a/src/web/forms.py b/src/web/forms.py index b23bf77f..bf321ae3 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -107,11 +107,11 @@ class SigninForm(RedirectForm): try: user = ucontr.get(email=self.email.data) except NotFound: - self.login.errors.append('Wrong login') + self.email.errors.append('Wrong login') validated = False else: if not user.is_active: - self.login.errors.append('User is desactivated') + self.email.errors.append('User is desactivated') validated = False if not ucontr.check_password(user, self.password.data): self.password.errors.append('Wrong password') -- cgit