From 43403e261a370c889de573ca64fec2f298619d65 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 9 Feb 2017 21:37:19 +0100 Subject: [PATCH] fix messaging --- rowers/urls.py | 2 +- rowers/views.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rowers/urls.py b/rowers/urls.py index 7c2c7bdc..6425b27e 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -210,8 +210,8 @@ urlpatterns = [ url(r'^team/(\d+)/requestmembership/(\d+)$',views.team_requestmembership_view), url(r'^team/(\d+)/delete/$',views.team_delete_view), url(r'^team/create/$',views.team_create_view), - url(r'^me/invitation/$',views.rower_invitations_view), url(r'^me/invitation/c/(?P\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/edit/c/(?P\w+.*)$',views.rower_edit_view), url(r'^me/edit/s/(?P\w+.*)$',views.rower_edit_view), diff --git a/rowers/views.py b/rowers/views.py index 1aecbd99..69994bf4 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -5404,12 +5404,14 @@ def rower_invitations_view(request,code=None,message='',successmessage=''): myteams = Team.objects.filter(manager=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') - + return render(request, 'teams.html', { 'teams':ts, 'myteams':myteams, 'invites':invites, + 'message':message, + 'successmessage':successmessage, 'otherteams':otherteams, })