more fixes

rowers/views/statements.py

@@ -44,7 +44,7 @@ from rowers.rower_rules import (
     can_view_target,can_change_target,can_delete_target,
     can_view_plan,can_change_plan,can_delete_plan,
     can_view_cycle,can_change_cycle,can_delete_cycle,
-    can_add_workout_member,
+    can_add_workout_member,can_plan_user,is_paid_coach
     )
 
 from django.shortcuts import render
@@ -348,9 +348,8 @@ def get_user_by_id(*args,**kwargs):
 
     return get_object_or_404(User,pk=id)
 
-def get_rower_by_userid(*args,**kwargs):
-    userid = kwargs['id']
-    u = User.objects.get(id=userid)
+def get_rower_by_userid(request,id):
+    u = User.objects.get(id=id)
     return u.rower
 
 def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
@@ -381,6 +380,7 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
         raise Http404("Rower doesn't exist")
 
     if userid != 0 and not is_coach_user(request.user,u):
+        request.session['rowerid'] = request.user.rower.id
         raise PermissionDenied("You have no access to this user")
 
     if notpermanent == False:
@@ -414,6 +414,7 @@ def getrequestplanrower(request,rowerid=0,userid=0,notpermanent=False):
         raise Http404("Rower doesn't exist")
 
     if not is_coach_user(request.user,r.user):
+        request.session['rowerid'] = r.id
         raise PermissionDenied("You have no access to this user")
 
     if notpermanent == False:
@@ -1038,23 +1039,6 @@ def iscoachmember(user):
 
     return result
 
-def cancreateteam(user):
-    if user.is_anonymous:
-        return False
-
-    try:
-        r = Rower.objects.get(user=user)
-    except Rower.DoesNotExist:
-        r = Rower(user=user)
-        r.save()
-
-    if user.is_authenticated and ('coach' in r.rowerplan):
-        return True
-    elif user.is_athenticated() and r.rowerplan in ['plan','pro']:
-        ts = Team.objects.filter(manager=user)
-        if len(otherteams) >= 1:
-            return False
-
 
 from rowers.utils import ProcessorCustomerError