diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py index 83814fb7..720daa5f 100644 --- a/rowers/tests/test_urls.py +++ b/rowers/tests/test_urls.py @@ -283,7 +283,7 @@ class URLTests(TestCase): for u in urls: if u not in tested and 'rowers' in u and 'http' not in u and 'authorize' not in u and 'import' not in u and 'logout' not in u: response2 = self.c.get(u) - if response2.status_code not in [200,302]: + if response2.status_code not in [200,302,301]: print(len(tested)) print(response.templates[0].name) print(url) @@ -291,7 +291,7 @@ class URLTests(TestCase): print(response2.status_code) tested.append(u) self.assertIn(response2.status_code, - [200,302]) + [200,302,301]) else: tested.append(u) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 4816147a..e9ceee47 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 0ecab5a8..86a21740 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -617,7 +617,7 @@ def fitnessmetric_view(request,id=0,mode='rower', 'name':'Analysis' }, { - 'url':reverse('fitness_metric_view'), + 'url':reverse('fitnessmetric_view'), 'name': 'Power Progress' } ] diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index 61cba565..535eb663 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -522,9 +522,11 @@ def rower_register_view(request): title='New User Sample Data', notes='This is an example workout to get you started') newworkoutid = response[0] - w = Workout.objects.get(id=newworkoutid) - w.startdatetime = timezone.now() - w.save() + if newworkoutid: + w = Workout.objects.get(id=newworkoutid) + w.startdatetime = timezone.now() + w.date = timezone.now().date() + w.save() # Create and send email fullemail = first_name + " " + last_name + " " + "<" + email + ">"