From 449dae2b9e2ede62ce0c019e73d54f7f6cc14295 Mon Sep 17 00:00:00 2001 From: Breizh Date: Mon, 3 Apr 2017 07:56:56 +0200 Subject: [PATCH] Corrections de code, au moins celles qui sautent aux yeux --- account/views.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/account/views.py b/account/views.py index 0e1c06d..2b312b1 100644 --- a/account/views.py +++ b/account/views.py @@ -2,13 +2,13 @@ from django.shortcuts import render, redirect from django.contrib.auth import authenticate from django.contrib.auth.models import User from django.contrib.auth import login as a_login, logout as a_logout -from account.forms import * from django.core.urlresolvers import reverse from django.core.validators import validate_email from django.conf import settings as s from django.http import JsonResponse -from home.views import homepage from django.http import HttpResponseNotFound +from account.forms import * +from home.views import homepage def login(request): """ @@ -43,7 +43,7 @@ def login(request): # BREIZH WILL DO IT BECAUSE HE WANT IT TO WORK WITHOUT JAVASCRIPT return render(request, 'login.html') else: - return HttpResponseNotFound(); + return HttpResponseNotFound() def logout(request): """ @@ -59,7 +59,6 @@ def signup(request): Signup user with ajax POST from signup page and return json """ - error = False form = InscriptionForm() if request.method == "POST": if form.is_valid(): @@ -69,13 +68,13 @@ def signup(request): email = form.cleaned_data["email"] cgu = form.cleaned_data["cgu"] if( - s.USERNAME_MAX_LENGTH < username.length < s.USERNAME_MIN_LENGTH or - s.PASSWORD_MAX_LENGTH < password.length < s.PASSWORD_MIN_LENGTH or + not (s.USERNAME_MAX_LENGTH > username.length > s.USERNAME_MIN_LENGTH) or + not (s.PASSWORD_MAX_LENGTH > password1.length > s.PASSWORD_MIN_LENGTH) or password1 != password2 or cgu is False ): data = { - signed:False, - error:"Désolé ! Nous ne sommes pas assez bête pour ne pas faire de verification server side !" + 'signed':False, + 'error':"Désolé ! Nous ne sommes pas assez bête pour ne pas faire de verification server side !" } return JsonResponse(data) @@ -83,19 +82,19 @@ def signup(request): validate_email(email) except forms.ValidationError: data = { - signed:False, - error:"Mauvais format d'e-mail" + 'signed':False, + 'error':"Mauvais format d'e-mail" } return JsonResponse(data) create_user(username, email, password1) authenticate(username, password1) data = { - signed:True + 'signed':True } return JsonResponse(data) return render(request, 'signup.html', locals()) def account(request): - return render(request, 'account.html') \ No newline at end of file + return render(request, 'account.html')