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

fix messaging

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-09 21:37:19 +01:00
parent 2c9f0fac27
commit 43403e261a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/urls.py
View File

@@ -210,8 +210,8 @@ urlpatterns = [
url(r'^team/(\d+)/requestmembership/(\d+)$',views.team_requestmembership_view), url(r'^team/(\d+)/requestmembership/(\d+)$',views.team_requestmembership_view),
url(r'^team/(\d+)/delete/$',views.team_delete_view), url(r'^team/(\d+)/delete/$',views.team_delete_view),
url(r'^team/create/$',views.team_create_view), url(r'^team/create/$',views.team_create_view),
url(r'^me/invitation/$',views.rower_invitations_view),
url(r'^me/invitation/c/(?P<message>\w+.*)/$',views.rower_invitations_view), url(r'^me/invitation/c/(?P<message>\w+.*)/$',views.rower_invitations_view),
url(r'^me/invitation/$',views.rower_invitations_view),
url(r'^me/invitation/(\w+.*)/$',views.rower_invitations_view), url(r'^me/invitation/(\w+.*)/$',views.rower_invitations_view),
url(r'^me/edit/c/(?P<message>\w+.*)$',views.rower_edit_view), url(r'^me/edit/c/(?P<message>\w+.*)$',views.rower_edit_view),
url(r'^me/edit/s/(?P<successmessage>\w+.*)$',views.rower_edit_view), url(r'^me/edit/s/(?P<successmessage>\w+.*)$',views.rower_edit_view),

4
rowers/views.py
View File

@@ -5404,12 +5404,14 @@ def rower_invitations_view(request,code=None,message='',successmessage=''):
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)
invites = TeamInvite.objects.filter(user=request.user) invites = TeamInvite.objects.filter(user=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')
return render(request, 'teams.html', return render(request, 'teams.html',
{ {
'teams':ts, 'teams':ts,
'myteams':myteams, 'myteams':myteams,
'invites':invites,
'message':message,
'successmessage':successmessage, 'successmessage':successmessage,
'otherteams':otherteams, 'otherteams':otherteams,
}) })