inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pep8

Browse source
This commit is contained in:
Élie Bouttier 2014-08-30 17:47:19 -07:00
parent 0ecf6d3dc9
commit 92ea48f89d
12 changed files with 55 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
accounts/forms.py
View file

@ -4,12 +4,12 @@ from django.forms.widgets import PasswordInput
from accounts.models import *
__all__ = [ 'UserForm', 'GroupForm', 'TeamForm' ]
__all__ = ['UserForm', 'GroupForm', 'TeamForm']
UserForm = modelform_factory(User,
fields=['username', 'first_name', 'last_name',
'password', 'email', 'is_superuser'],
fields=['username', 'first_name',
'last_name', 'password', 'email', 'is_superuser'],
widgets={'password': PasswordInput})
GroupForm = modelform_factory(Group,
fields=['name'])

8
accounts/models.py
View file

@ -5,14 +5,14 @@ from django.contrib import auth
from django.utils.encoding import python_2_unicode_compatible
__all__ = [ 'User', 'Group', 'Team' ]
__all__ = ['User', 'Group', 'Team']
@python_2_unicode_compatible
class User(AbstractUser):
class Meta:
ordering = [ 'username' ]
ordering = ['username']
@property
def teams(self):
@ -45,7 +45,7 @@ class User(AbstractUser):
class Group(auth.models.Group):
class Meta:
ordering = [ 'name' ]
ordering = ['name']
proxy = True
@property
@ -57,7 +57,7 @@ class Group(auth.models.Group):
class Team(models.Model):
class Meta:
ordering = [ 'name' ]
ordering = ['name']
name = models.CharField(max_length=128, unique=True)

33
accounts/views.py
View file

@ -151,7 +151,8 @@ def group_add_user(request, group):
else:
user.groups.add(group)
user.save()
messages.success(request, 'User added to group successfully.')
messages.success(request,
'User added to group successfully.')
else:
messages.error(request, 'User not found.')
return redirect('show-group', group.id)
@ -160,12 +161,12 @@ def group_add_user(request, group):
if not term:
return Http404()
query = Q(username__icontains=term) \
| Q(first_name__icontains=term) \
| Q(last_name__icontains=term)
| Q(first_name__icontains=term) \
| Q(last_name__icontains=term)
users = User.objects.exclude(groups=group).filter(query)[:10]
response = []
for user in users:
response += [ {
response += [{
'label': user.username_and_fullname,
'value': user.username,
}]
@ -249,7 +250,8 @@ def team_add_user(request, team):
else:
team.users.add(user)
team.save()
messages.success(request, 'User added to team successfully.')
messages.success(request,
'User added to team successfully.')
else:
messages.error(request, 'User not found.')
request.session['team-tab'] = 'user'
@ -259,15 +261,15 @@ def team_add_user(request, team):
if not term:
return Http404()
query = Q(username__icontains=term) \
| Q(first_name__icontains=term) \
| Q(last_name__icontains=term)
| Q(first_name__icontains=term) \
| Q(last_name__icontains=term)
users = User.objects \
.exclude(groups__in=team.groups.all()) \
.exclude(id__in=team.users.values('id')) \
.filter(query)[:10]
.exclude(groups__in=team.groups.all()) \
.exclude(id__in=team.users.values('id')) \
.filter(query)[:10]
response = []
for user in users:
response += [ {
response += [{
'label': user.username_and_fullname,
'value': user.username,
}]
@ -299,7 +301,8 @@ def team_add_group(request, team):
else:
team.groups.add(group)
team.save()
messages.success(request, 'Group added to team successfully.')
messages.success(request,
'Group added to team successfully.')
else:
messages.error(request, 'Group not found.')
request.session['team-tab'] = 'group'
@ -309,11 +312,11 @@ def team_add_group(request, team):
if not term:
return Http404()
groups = Group.objects \
.exclude(id__in=team.groups.values('id')) \
.filter(name__icontains=term)[:10]
.exclude(id__in=team.groups.values('id')) \
.filter(name__icontains=term)[:10]
response = []
for group in groups:
response += [ {
response += [{
'label': group.name,
'value': group.name,
}]