taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Bug #203

remotes/origin/enhancement/email-actions
David Barragán Merino 2014-03-11 12:36:51 +01:00
parent 4b7a6d256f
commit 4a02935230
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taiga/base/auth/api.py
View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.db.models.loading import get_model from django.db.models.loading import get_model
from django.db.models import Q
from django.contrib.auth import logout, login, authenticate from django.contrib.auth import logout, login, authenticate
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -61,6 +62,9 @@ class AuthViewSet(viewsets.ViewSet):
data = serializer.data data = serializer.data
if User.objects.filter(Q(username=data["username"]) | Q(email=data["email"])).exists():
raise exc.BadRequest(_("This username or email is already in use."))
user = User(username=data["username"], user = User(username=data["username"],
first_name=data["first_name"], first_name=data["first_name"],
last_name=data["last_name"], last_name=data["last_name"],
@ -108,6 +112,10 @@ class AuthViewSet(viewsets.ViewSet):
raise exc.BadRequest(serializer.errors) raise exc.BadRequest(serializer.errors)
data = serializer.data data = serializer.data
if User.objects.filter(Q(username=data["username"]) | Q(email=data["email"])).exists():
raise exc.BadRequest(_("This username or email is already in use."))
user = User(username=data["username"], user = User(username=data["username"],
first_name=data["first_name"], first_name=data["first_name"],
last_name=data["last_name"], last_name=data["last_name"],