Merge branch 'feature/groups' into develop

rowers/teams.py

@@ -135,8 +135,8 @@ def add_member(id,rower):
     t= Team.objects.get(id=id)
     try:
         rower.team.add(t)
-    except ValidationError:
-        return(0,"Couldn't add member")
+    except ValidationError as e:
+        return(0,"Couldn't add member: "+str(e.message))
         
     # code to add all workouts
     ws = Workout.objects.filter(user=rower)

rowers/views/teamviews.py

@@ -15,12 +15,17 @@ def team_view(request,id=0,userid=0):
     myteams, memberteams, otherteams = get_teams(request)
     teams.remove_expired_invites()
 
+
     
     try:
         t = Team.objects.get(id=id)
     except Team.DoesNotExist:
         raise Http404("Team doesn't exist")
 
+    if r.rowerplan == 'basic' and t.manager.rower.rowerplan != 'coach':
+        raise PermissionDenied("You need to be on a Paid Plan to see or join this team")
+
+    
     q = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name)
     mygroups = [request.user.rower.mycoachgroup]
     q2 = User.objects.filter(rower__isnull=False,rower__coachinggroups__in=mygroups).distinct().exclude(rower__team__name=t.name)
@@ -168,19 +173,22 @@ def get_teams(request):
         private='open').exclude(
             rower=r).exclude(manager=request.user).order_by('name')
 
+    if r.rowerplan == 'basic':
+        otherteams = otherteams.filter(manager__rower__rowerplan='coach')
+
     return myteams, memberteams, otherteams
 
 @login_required()
-def rower_teams_view(request,message='',successmessage=''):
+def rower_teams_view(request):
     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
+                messages.info(request,text)
             else:
-                message = text
+                messages.error(request,text)
     else:
         form = TeamInviteCodeForm()
             
@@ -249,8 +257,6 @@ def rower_teams_view(request,message='',successmessage=''):
     #    clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)
     #   max_clubsize = r.clubsize
 
-    messages.info(request,successmessage)
-    messages.error(request,message)
 
     breadcrumbs = [
         {
@@ -312,18 +318,14 @@ def manager_member_drop_view(request,teamid,userid,
     return HttpResponseRedirect(url)
 
 @login_required()
-def manager_requests_view(request,code=None,message='',successmessage=''):
+def manager_requests_view(request,code=None):
     if code:
         res,text = teams.process_request_code(request.user,code)
         if res:
-            successmessage = text
-            message = ''
+            messages.info(request,text)
         else:
-            message = text
-            successmessage = ''
+            messages.error(request,text)
 
-    messages.info(request,successmessage)
-    messages.error(request,message)
     url = reverse(rower_teams_view,kwargs={
     })
     return HttpResponseRedirect(url)