DGNum/ernestophone.ens.fr
6
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Django18

Browse source
This commit is contained in:
Martin Pépin 2016-09-23 23:03:08 +02:00
commit 6af610dabc
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ernestophone/settings-example.py
View file

@ -30,6 +30,7 @@ DEBUG = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
ACCOUNT_CREATION_PASS = ''
# Application definition # Application definition

4
calendrier/views.py
View file

@ -120,7 +120,7 @@ def resend(request, id):
sender = 'fanfare@ens.fr' sender = 'fanfare@ens.fr'
receivers = [user.user.email] receivers = [user.user.email]
if message != '': if message != '':
text = message text = "%s\n\n" % message
else: else:
text = "Bonjour, un évémenent a été créé.\n" text = "Bonjour, un évémenent a été créé.\n"
domain = get_current_site(request).domain domain = get_current_site(request).domain
@ -195,7 +195,7 @@ def create_event(request):
sender = 'fanfare@ens.fr' sender = 'fanfare@ens.fr'
receivers = [user.user.email] receivers = [user.user.email]
if message != '': if message != '':
text = message text = "%s\n\n" % message
else: else:
text = "Bonjour, un évémenent a été créé.\n" text = "Bonjour, un évémenent a été créé.\n"
domain = get_current_site(request).domain domain = get_current_site(request).domain

4
gestion/views.py
View file

@ -3,6 +3,7 @@ from django.contrib.auth.views import login as django_login_view
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.forms import PasswordChangeForm from django.contrib.auth.forms import PasswordChangeForm
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.conf import settings
from datetime import datetime from datetime import datetime
@ -21,7 +22,8 @@ def inscription_membre(request):
comp_form = InscriptionMembreForm(requbis) comp_form = InscriptionMembreForm(requbis)
if user_form.is_valid() and comp_form.is_valid(): if user_form.is_valid() and comp_form.is_valid():
pseudo = user_form.cleaned_data['username'] pseudo = user_form.cleaned_data['username']
if not (comp_form.cleaned_data['validation'] == "Pouet-ta-mere"): if not (comp_form.cleaned_data['validation']
== settings.ACCOUNT_CREATION_PASS):
error = "Le champ Validation ne correspond pas à celui attendu" error = "Le champ Validation ne correspond pas à celui attendu"
return render(request, "gestion/registration.html", locals()) return render(request, "gestion/registration.html", locals())
member = user_form.save(commit=False) member = user_form.save(commit=False)