Merge branch 'develop' into feature/workoutfit
This commit is contained in:
@@ -116,6 +116,8 @@ class UserFullnameChoiceField(forms.ModelChoiceField):
|
||||
def label_from_instance(self,obj):
|
||||
return obj.get_full_name()
|
||||
|
||||
class PlannedSessionStepField(models.TextField):
|
||||
pass
|
||||
|
||||
# model for configurable template field
|
||||
class TemplateListField(models.TextField):
|
||||
|
||||
@@ -2188,7 +2188,7 @@ def rankings_view2(request,userid=0,
|
||||
if userid == 0:
|
||||
userid = request.user.id
|
||||
else:
|
||||
lastupdated = "01-01-1900"
|
||||
lastupdated = "1900-01-01"
|
||||
|
||||
|
||||
promember=0
|
||||
|
||||
Reference in New Issue
Block a user