From c8a172acbc134821438ee4ece613e93eeab75dfd Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 8 Dec 2017 10:56:24 +0100 Subject: [PATCH 1/3] list no name --- rowers/interactiveplots.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 8f8715e1..25a181c2 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -236,7 +236,10 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): dates.append(dd) durations.append(du) types.append(w.workouttype) - rowers.append(w.user.user.first_name[0]+w.user.user.last_name[0]) + try: + rowers.append(w.user.user.first_name[0]+w.user.user.last_name[0]) + except IndexError: + rowers.append(str(w.user)) try: d = utc.localize(startdate) From be596dd060a12d1d5219484c8d9ae8c52c3f25c5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 8 Dec 2017 10:59:48 +0100 Subject: [PATCH 2/3] show login when user first name is empty --- templates/basebase.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/basebase.html b/templates/basebase.html index deca65f2..2a97d27c 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -117,7 +117,11 @@
{% if user.is_authenticated %}

+ {% if user.first_name %} {{ user.first_name }} + {% else %} + {{ user }} + {% endif %}

Edit user account, e.g. heart rate zones, power zones, email, teams From ce8d30dba64e2f5f047dae0d2cb22038d8ff6a93 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 8 Dec 2017 11:11:16 +0100 Subject: [PATCH 3/3] forcing first name to have at least one character in user form --- rowers/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rowers/models.py b/rowers/models.py index 3ca03ad9..2fa222f5 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -987,6 +987,14 @@ class UserForm(ModelForm): model = User fields = ['first_name','last_name','email'] + def clean_first_name(self): + first_name = self.cleaned_data.get('first_name') + + if len(first_name): + return first_name + + raise forms.ValidationError('Please fill in your first name') + def clean_email(self): email = self.cleaned_data.get('email')