passing tests again - now with coachinggroups

rowers/models.py

@@ -633,7 +633,7 @@ class PaidPlan(models.Model):
             )
 
 class CoachingGroup(models.Model):
-    pass
+    name = models.CharField(default='group',max_length=30,null=True,blank=True)
     
 # Extension of User with rowing specific data
 class Rower(models.Model):
@@ -1003,13 +1003,15 @@ def checkworkoutuser(user,workout):
         return False
     try:
 	r = Rower.objects.get(user=user)
-        coaches = rower_get_coaches(user.rower)
         if workout.user == r:
             return True
-        elif coaches:
-            for coach in coaches:
-                if user.rower == coach and workout.privacy == 'visible':
-                    return True
+        coaches = []
+        for group in workout.user.coachinggroups.all():
+            coach = Rower.objects.get(mycoachgroup=group)
+            coaches.append(coach)
+        for coach in coaches:
+            if user.rower == coach and workout.privacy == 'visible':
+                return True
         else:
             return False
     except Rower.DoesNotExist:
@@ -1022,11 +1024,13 @@ def checkaccessuser(user,rower):
         r = Rower.objects.get(user=user)
         if rower == r:
             return True
-        coaches = rower_get_coaches(rower)
-        if coaches:
-            for coach in coaches:
-                if user.rower == coach:
-                    return True
+        coaches = []
+        for group in rower.coachinggroups.all():
+            coach = Rower.objects.get(mycoachgroup=group)
+            coaches.append(coach)
+        for coach in coaches:
+            if user.rower == coach:
+                return True
         else:
             return False
     except Rower.DoesNotExist: