passing 1 test
This commit is contained in:
@@ -334,7 +334,7 @@ class Team(models.Model):
|
|||||||
|
|
||||||
name = models.CharField(max_length=150,unique=True,verbose_name='Team Name')
|
name = models.CharField(max_length=150,unique=True,verbose_name='Team Name')
|
||||||
notes = models.CharField(blank=True,max_length=200,verbose_name='Team Purpose')
|
notes = models.CharField(blank=True,max_length=200,verbose_name='Team Purpose')
|
||||||
manager = models.ForeignKey(User, null=True, validators=[is_not_basic])
|
manager = models.ForeignKey(User, null=True,) # validators=[is_not_basic])
|
||||||
private = models.CharField(max_length=30,choices=choices,default='open',
|
private = models.CharField(max_length=30,choices=choices,default='open',
|
||||||
verbose_name='Team Type')
|
verbose_name='Team Type')
|
||||||
|
|
||||||
@@ -343,6 +343,14 @@ class Team(models.Model):
|
|||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
manager = self.manager
|
||||||
|
if manager.rower.rowerplan == 'basic':
|
||||||
|
raise ValidationError(
|
||||||
|
"Basic user cannot be team manager"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TeamForm(ModelForm):
|
class TeamForm(ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Team
|
model = Team
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import rowers.plannedsessions as plannedsessions
|
|||||||
|
|
||||||
@override_settings(TESTING=True)
|
@override_settings(TESTING=True)
|
||||||
class PermissionsBasicsTests(TestCase):
|
class PermissionsBasicsTests(TestCase):
|
||||||
def setUp:
|
def setUp(self):
|
||||||
self.c = Client()
|
self.c = Client()
|
||||||
## Users - Pro, Basic, Coach & Self Coach
|
## Users - Pro, Basic, Coach & Self Coach
|
||||||
|
|
||||||
@@ -32,11 +32,11 @@ class PermissionsBasicsTests(TestCase):
|
|||||||
gdproptin=True,gdproptindate=timezone.now(),
|
gdproptin=True,gdproptindate=timezone.now(),
|
||||||
rowerplan='plan')
|
rowerplan='plan')
|
||||||
|
|
||||||
self.uselfplan_workouts = WorkoutFactory.create_batch(5, user=self.rselfplan)
|
self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan)
|
||||||
self.factory = RequestFactory()
|
self.factory = RequestFactory()
|
||||||
self.password = faker.word()
|
self.password = faker.word()
|
||||||
self.uselfplan.set_password(self.password)
|
self.uplan.set_password(self.password)
|
||||||
self.uselfplan.save()
|
self.uplan.save()
|
||||||
|
|
||||||
self.upro = UserFactory(username='prouser')
|
self.upro = UserFactory(username='prouser')
|
||||||
self.rpro = Rower.objects.create(user=self.upro,
|
self.rpro = Rower.objects.create(user=self.upro,
|
||||||
@@ -96,7 +96,13 @@ class PermissionsBasicsTests(TestCase):
|
|||||||
|
|
||||||
## Basic cannot manage a group
|
## Basic cannot manage a group
|
||||||
def test_basic_groupmanager(self):
|
def test_basic_groupmanager(self):
|
||||||
self.assertRaises ...
|
with self.assertRaises(ValidationError):
|
||||||
|
team = Team.objects.create(
|
||||||
|
name = 'ThisTeamShouldNotExist',
|
||||||
|
notes = faker.text(),
|
||||||
|
manager = self.ubasic,
|
||||||
|
private = 'open',
|
||||||
|
viewing = 'allmembers')
|
||||||
|
|
||||||
# View based
|
# View based
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user