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

Merge branch 'develop' into feature/workoutfit

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-01 13:25:40 +01:00
parent b1a9736aea 7ec917db59
commit 19560145e2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/models.py
View File

@@ -116,6 +116,8 @@ class UserFullnameChoiceField(forms.ModelChoiceField):
def label_from_instance(self,obj): def label_from_instance(self,obj):
return obj.get_full_name() return obj.get_full_name()
class PlannedSessionStepField(models.TextField):
pass
# model for configurable template field # model for configurable template field
class TemplateListField(models.TextField): class TemplateListField(models.TextField):

2
rowers/views/analysisviews.py
View File

@@ -2188,7 +2188,7 @@ def rankings_view2(request,userid=0,
if userid == 0: if userid == 0:
userid = request.user.id userid = request.user.id
else: else:
lastupdated = "01-01-1900" lastupdated = "1900-01-01"
promember=0 promember=0