Merge branch 'dev' of gitea.planet-casio.com:devs/PCv5 into dev

This commit is contained in:
Eragon 2019-09-08 16:45:11 +02:00
commit b628510455
No known key found for this signature in database
GPG Key ID: B2B1BF4DA61BBB85
3 changed files with 7 additions and 2 deletions

View File

@ -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')

View File

@ -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)

View File

@ -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;