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

Merge branch 'develop' into feature/embeddedvideo

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-11 21:57:23 +01:00
parent 9ded10d692 680c64a43c
commit 7329fb4f3b
10 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/models.py
View File

@@ -106,7 +106,7 @@ class TemplateListField(models.TextField):
return value.split(self.token)
def from_db_value(self,value, expression, connection, context):
def from_db_value(self,value, expression, connection):
if value is None:
return value
if isinstance(value, list):
@@ -149,7 +149,7 @@ class PowerZonesField(models.TextField):
return value.split(self.token)
def from_db_value(self,value, expression, connection, context):
def from_db_value(self,value, expression, connection):
if value is None:
return value
if isinstance(value, list):
@@ -3030,7 +3030,6 @@ strokedatafields = {
'hr_an':models.IntegerField(null=True),
'hr_max':models.IntegerField(null=True),
'hr_bottom':models.IntegerField(null=True),
'x_right':models.FloatField(null=True),
'ergpace':models.FloatField(null=True),
'nowindpace':models.FloatField(null=True),
'equivergpower':models.FloatField(null=True),