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

buxfix

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-09 21:17:24 +01:00
parent 08f1b0a127
commit c06dd204d0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/teams.py
View File

@@ -9,6 +9,11 @@ from django.db import IntegrityError
import uuid import uuid
from django.conf import settings from django.conf import settings
import django_rq
queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('low')
from rowers.models import ( from rowers.models import (
Rower, Workout, Team, TeamInvite,User Rower, Workout, Team, TeamInvite,User
) )
@@ -176,7 +181,8 @@ def send_invite_email(id):
if settings.DEBUG: if settings.DEBUG:
res = handle_sendemail_invite.delay(email,name,code,teamname,manager) res = handle_sendemail_invite.delay(email,name,code,teamname,manager)
else: else:
queue.enqueue(handle_sendemail_invite,email,name,code,teamname,manager) res = queuehigh.enqueue(handle_sendemail_invite,
email,name,code,teamname,manager)
return (1,'Invitation email sent') return (1,'Invitation email sent')

2
rowers/views.py
View File

@@ -5403,7 +5403,7 @@ def rower_invitations_view(request,code=None,message='',successmessage=''):
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)
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',