diff --git a/app/routes/account/account.py b/app/routes/account/account.py index 13e6b4b..8c9fb17 100644 --- a/app/routes/account/account.py +++ b/app/routes/account/account.py @@ -57,6 +57,7 @@ def register(): form = RegistrationForm() if form.validate_on_submit(): member = Member(form.username.data, form.email.data, form.password.data) + member.newsletter = form.newsletter.data db.session.add(member) db.session.commit() flash('Inscription réussie', 'ok') diff --git a/app/routes/account/login.py b/app/routes/account/login.py index 6295935..c63bce9 100644 --- a/app/routes/account/login.py +++ b/app/routes/account/login.py @@ -1,5 +1,6 @@ from flask import redirect, url_for, request, flash from flask_login import login_user, logout_user, login_required, current_user +from urllib.parse import urlparse from app import app from app.forms.login import LoginForm from app.models.users import Member @@ -18,7 +19,7 @@ def login(): member = Member.query.filter_by(name=form.username.data).first() # Check if member can login - if "No login" in [g.name for g in member.groups]: + if member is not None and "No login" in [g.name for g in member.groups]: flash('Cet utilisateur ne peut pas se connecter', 'error') if request.referrer: return redirect(request.referrer) diff --git a/app/static/css/light.css b/app/static/css/light.css index a59aea3..109aedf 100644 --- a/app/static/css/light.css +++ b/app/static/css/light.css @@ -122,7 +122,10 @@ display: block; margin: 5px 15px; padding: 5px 10px; font-size: 14px; - background: #e8e8e8; transition: background .15s ease; + transition: background .15s ease; +} +#menu form label { + float: left; margin-right: 10px; } #menu form input:first-child { margin-bottom: 0; border-bottom: none;