From c06dd204d0df7aec8e0b8bf1f5b274cfb209d303 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 9 Feb 2017 21:17:24 +0100 Subject: [PATCH] buxfix --- rowers/teams.py | 8 +++++++- rowers/views.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rowers/teams.py b/rowers/teams.py index 19c0d06d..b4419992 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -9,6 +9,11 @@ from django.db import IntegrityError import uuid 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 ( Rower, Workout, Team, TeamInvite,User ) @@ -176,7 +181,8 @@ def send_invite_email(id): if settings.DEBUG: res = handle_sendemail_invite.delay(email,name,code,teamname,manager) 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') diff --git a/rowers/views.py b/rowers/views.py index a5fb9dc0..1aecbd99 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -5403,7 +5403,7 @@ def rower_invitations_view(request,code=None,message='',successmessage=''): ts = Team.objects.filter(rower=r) myteams = Team.objects.filter(manager=request.user) invites = TeamInvite.objects.filter(user=request.user) - otherteams = Team.objects.filter(private='open').drop(rower=r) + otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name') return render(request, 'teams.html', {