sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge tag 'team_management' into develop

Browse Source 
team management
This commit is contained in:
Sander Roosendaal
2017-02-09 20:59:32 +01:00
parent 51b97f6821 560698a5d1
commit 08f1b0a127
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/teams.html
View File

@@ -105,7 +105,7 @@
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>&nbsp;</th> <th>Manager</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
rowers/views.py
View File

@@ -5364,7 +5364,7 @@ def rower_teams_view(request):
def rower_teams_view(request): def rower_teams_view(request):
r = Rower.objects.get(user=request.user) r = Rower.objects.get(user=request.user)
ts = Team.objects.filter(rower=r) ts = Team.objects.filter(rower=r)
myteams = Team.objects.filter(manager=request.user) myteams = Team.objects.filter(manager=request.user)
otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name') otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name')
teams.remove_expired_invites() teams.remove_expired_invites()