0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

import User and Group in views.py, fixes #1466

Browse source
This commit is contained in:
j 2013-03-30 11:07:52 +00:00
parent 056cb0d699
commit e987c2f26b
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pandora/user/views.py
View file

@ -10,6 +10,7 @@ from django.conf import settings
from django.core.mail import send_mail, BadHeaderError, EmailMessage from django.core.mail import send_mail, BadHeaderError, EmailMessage
from django.shortcuts import redirect from django.shortcuts import redirect
from django.db.models import Max from django.db.models import Max
from django.contrib.auth.models import User, Group
from ox.django.shortcuts import render_to_json_response, json_response, get_object_or_404_json from ox.django.shortcuts import render_to_json_response, json_response, get_object_or_404_json
from ox.django.decorators import admin_required_json, login_required_json from ox.django.decorators import admin_required_json, login_required_json
@ -43,7 +44,7 @@ def signin(request):
data = json.loads(request.POST['data']) data = json.loads(request.POST['data'])
if 'username' in data and 'password' in data: if 'username' in data and 'password' in data:
data['username'] = data['username'].strip() data['username'] = data['username'].strip()
qs = models.User.objects.filter(username__iexact=data['username']) qs = User.objects.filter(username__iexact=data['username'])
if qs.count() == 0: if qs.count() == 0:
response = json_response({ response = json_response({
'errors': { 'errors': {
@ -126,13 +127,13 @@ def signup(request):
data['username'] = data['username'].strip() data['username'] = data['username'].strip()
if 'email' in data: if 'email' in data:
data['email'] = ox.escape_html(data['email']) data['email'] = ox.escape_html(data['email'])
if models.User.objects.filter(username__iexact=data['username']).count() > 0: if User.objects.filter(username__iexact=data['username']).count() > 0:
response = json_response({ response = json_response({
'errors': { 'errors': {
'username': 'Username already exists' 'username': 'Username already exists'
} }
}) })
elif models.User.objects.filter(email__iexact=data['email']).count() > 0: elif User.objects.filter(email__iexact=data['email']).count() > 0:
response = json_response({ response = json_response({
'errors': { 'errors': {
'email': 'Email address already exits' 'email': 'Email address already exits'
@ -145,8 +146,8 @@ def signup(request):
} }
}) })
else: else:
first_user = models.User.objects.count() == 0 first_user = User.objects.count() == 0
user = models.User(username=data['username'], email=data['email']) user = User(username=data['username'], email=data['email'])
user.set_password(data['password']) user.set_password(data['password'])
#make first user admin #make first user admin
user.is_superuser = first_user user.is_superuser = first_user
@ -256,13 +257,13 @@ def requestToken(request):
user = None user = None
if 'username' in data: if 'username' in data:
try: try:
user = models.User.objects.get(username__iexact=data['username']) user = User.objects.get(username__iexact=data['username'])
except models.User.DoesNotExist: except User.DoesNotExist:
user = None user = None
elif 'email' in data: elif 'email' in data:
try: try:
user = models.User.objects.get(email__iexact=data['email']) user = User.objects.get(email__iexact=data['email'])
except models.User.DoesNotExist: except User.DoesNotExist:
user = None user = None
if user: if user:
while True: while True:
@ -316,14 +317,14 @@ def editUser(request):
''' '''
response = json_response() response = json_response()
data = json.loads(request.POST['data']) data = json.loads(request.POST['data'])
user = get_object_or_404_json(models.User, pk=ox.fromAZ(data['id'])) user = get_object_or_404_json(User, pk=ox.fromAZ(data['id']))
profile = user.get_profile() profile = user.get_profile()
if 'disabled' in data: if 'disabled' in data:
user.is_active = not data['disabled'] user.is_active = not data['disabled']
if 'email' in data: if 'email' in data:
if 'email' in data: if 'email' in data:
data['email'] = ox.escape_html(data['email']) data['email'] = ox.escape_html(data['email'])
if models.User.objects.filter(email__iexact=data['email']).exclude(id=user.id).count()>0: if User.objects.filter(email__iexact=data['email']).exclude(id=user.id).count()>0:
response = json_response(status=403, text='email already in use') response = json_response(status=403, text='email already in use')
return render_to_json_response(response) return render_to_json_response(response)
user.email = data['email'] user.email = data['email']
@ -341,10 +342,10 @@ def editUser(request):
user.groups.exclude(name__in=groups).delete() user.groups.exclude(name__in=groups).delete()
current_groups = [g.name for g in user.groups.all()] current_groups = [g.name for g in user.groups.all()]
for g in filter(lambda g: g not in current_groups, groups): for g in filter(lambda g: g not in current_groups, groups):
group, created = models.Group.objects.get_or_create(name=g) group, created = Group.objects.get_or_create(name=g)
user.groups.add(group) user.groups.add(group)
if 'username' in data: if 'username' in data:
if models.User.objects.filter( if User.objects.filter(
username__iexact=data['username']).exclude(id=user.id).count()>0: username__iexact=data['username']).exclude(id=user.id).count()>0:
response = json_response(status=403, text='username already in use') response = json_response(status=403, text='username already in use')
return render_to_json_response(response) return render_to_json_response(response)
@ -365,7 +366,7 @@ def removeUser(request):
''' '''
response = json_response() response = json_response()
data = json.load(request.POST['data']) data = json.load(request.POST['data'])
user = get_object_or_404_json(models.User, username=data['username']) user = get_object_or_404_json(User, username=data['username'])
user.delete() user.delete()
return render_to_json_response(response) return render_to_json_response(response)
actions.register(removeUser, cache=False) actions.register(removeUser, cache=False)
@ -392,10 +393,10 @@ def findUser(request):
if data['key'] == 'email': if data['key'] == 'email':
response['data']['users'] = [models.user_json(u, keys) response['data']['users'] = [models.user_json(u, keys)
for u in models.User.objects.filter(email__iexact=data['value'])] for u in User.objects.filter(email__iexact=data['value'])]
else: else:
response['data']['users'] = [models.user_json(u, keys) response['data']['users'] = [models.user_json(u, keys)
for u in models.User.objects.filter(username__iexact=data['value'])] for u in User.objects.filter(username__iexact=data['value'])]
return render_to_json_response(response) return render_to_json_response(response)
actions.register(findUser) actions.register(findUser)
@ -557,7 +558,7 @@ def mail(request):
'Reply-To': settings.CONFIG['site']['email']['contact'] 'Reply-To': settings.CONFIG['site']['email']['contact']
} }
subject = data.get('subject', '').strip() subject = data.get('subject', '').strip()
users = [models.User.objects.get(username=username) for username in data['to']] users = [User.objects.get(username=username) for username in data['to']]
for user in users: for user in users:
if user.email: if user.email:
message = data['message'] message = data['message']
@ -683,7 +684,7 @@ def editPreferences(request):
change = False change = False
response = json_response() response = json_response()
if 'email' in data: if 'email' in data:
if models.User.objects.filter( if User.objects.filter(
email=data['email']).exclude(username=request.user.username).count()>0: email=data['email']).exclude(username=request.user.username).count()>0:
errors['email'] = 'Email address already in use' errors['email'] = 'Email address already in use'
else: else: