sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

corrected training plan permissions and form

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-16 16:02:50 +02:00
parent 3f1c456054
commit 304b2559c7
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/models.py
View File

@@ -914,7 +914,7 @@ def check_teams_on_change(sender, **kwargs):
team = Team.objects.get(id=id)
if team.manager.rower.rowerplan not in ['coach']:
raise ValidationError(
"You cannot join a team led by a Pro or Self-Coach user"
"You cannot join a team led by a Pro, Free Coach Plan or Self-Coach user"
)
m2m_changed.connect(check_teams_on_change, sender=Rower.team.through)
@@ -1075,7 +1075,7 @@ def checkaccessplanuser(user,rower):
r = Rower.objects.get(user=user)
if rower == r:
return True
team_managers = [t.manager for t in rower.team.all() if t.manager.rower.rowerplan in ['plan','coach']]
team_managers = [t.manager for t in rower.team.all() if t.manager.rower.rowerplan in ['plan','coach','freecoach']]
if user.rower.rowerplan != 'basic':
return user in team_managers
else:
@@ -3271,7 +3271,7 @@ class AccountRowerForm(ModelForm):
def __init__(self, *args, **kwargs):
super(AccountRowerForm, self).__init__(*args, **kwargs)
if self.instance.rowerplan != 'coach':
if 'coach' not in self.instance.rowerplan:
self.fields.pop('offercoaching')