repaired celery, c2 error, finish merge

rowers/views.py

@@ -647,7 +647,7 @@ def c2_open(user):
             if res[0] != None:
                 thetoken = res[0]
             else:
-                thetoken = r.c2token
+                raise C2NoTokenError("User has no token")
 	else:
 	    thetoken = r.c2token
 
@@ -5081,8 +5081,22 @@ def team_leave_view(request,id=0):
     url = reverse(rower_teams_view)
     response = HttpResponseRedirect(url)
     return response
+
+from rowers.forms import TeamInviteCodeForm
 
 @login_required()
+def rower_teams_view(request,message='',successmessage=''):
+    if request.method == 'POST':
+        form = TeamInviteCodeForm(request.POST)
+        if form.is_valid():
+            code = form.cleaned_data['code']
+            res,text = teams.process_invite_code(request.user,code)
+            if res:
+                successmessage = text
+            else:
+                message = text
+    else:
+        form = TeamInviteCodeForm()
             
     r = Rower.objects.get(user=request.user)
     ts = Team.objects.filter(rower=r)
@@ -5093,6 +5107,8 @@ def rower_teams_view(request,message='',successmessage=''):
     invites = TeamInvite.objects.filter(user=request.user)
     requests = TeamRequest.objects.filter(user=request.user)
     myrequests = TeamRequest.objects.filter(team__in=myteams)
+    myinvites = TeamInvite.objects.filter(team__in=myteams)
+
     print form
     
     return render(request, 'teams.html',
@@ -5102,6 +5118,7 @@ def rower_teams_view(request,message='',successmessage=''):
                       'invites':invites,
                       'otherteams':otherteams,
                       'requests':requests,
+                      'myrequests':myrequests,
                       'form':form,
                       'message':message,
                       'successmessage':successmessage,