Merge branch 'release/v18.6.14'
This commit is contained in:
@@ -536,7 +536,7 @@ class TeamInviteForm(ModelForm):
|
|||||||
super(TeamInviteForm, self).__init__(*args, **kwargs)
|
super(TeamInviteForm, self).__init__(*args, **kwargs)
|
||||||
if userid:
|
if userid:
|
||||||
self.fields['user'].initial = userid
|
self.fields['user'].initial = userid
|
||||||
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = TeamInvite
|
model = TeamInvite
|
||||||
@@ -2655,7 +2655,7 @@ class PlannedSession(models.Model):
|
|||||||
can_be_shared = models.BooleanField(default=True)
|
can_be_shared = models.BooleanField(default=True)
|
||||||
|
|
||||||
fitfile = models.FileField(upload_to=get_file_path, blank=True, null=True)
|
fitfile = models.FileField(upload_to=get_file_path, blank=True, null=True)
|
||||||
steps = PlannedSessionStepField(default={}, null=True, max_length=1000)
|
steps = PlannedSessionStepField(default={}, null=True, max_length=1000, blank=True)
|
||||||
interval_string = models.TextField(max_length=1000, default=None, blank=True, null=True,
|
interval_string = models.TextField(max_length=1000, default=None, blank=True, null=True,
|
||||||
verbose_name='Interval String (optional)')
|
verbose_name='Interval String (optional)')
|
||||||
garmin_workout_id = models.BigIntegerField(default=0)
|
garmin_workout_id = models.BigIntegerField(default=0)
|
||||||
|
|||||||
Reference in New Issue
Block a user