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

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-12 21:48:59 -04:00
parent 6722d0f9b8
commit 1c63c6ef3a
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/tests/test_errorpages.py
View File

@@ -14,7 +14,8 @@ class TestErrorPages(TestCase):
factory = RequestFactory() factory = RequestFactory()
request = factory.get('/') request = factory.get('/')
response = error404_view(request) e = None
response = error404_view(request,e )
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
self.assertIn('404 Page not found', str(response.content)) self.assertIn('404 Page not found', str(response.content))
@@ -22,7 +23,7 @@ class TestErrorPages(TestCase):
self.assertEqual(response.status_code, 500) self.assertEqual(response.status_code, 500)
self.assertIn('500 Internal Server Error', str(response.content)) self.assertIn('500 Internal Server Error', str(response.content))
response = error400_view(request) response = error400_view(request, e)
self.assertEqual(response.status_code, 400) self.assertEqual(response.status_code, 400)

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

4
rowers/views/errorviews.py
View File

@@ -22,14 +22,14 @@ def error500_view(request):
response.status_code = 500 response.status_code = 500
return response return response
def error404_view(request): def error404_view(request, exception):
response = render(request,'404.html', {},status=404) response = render(request,'404.html', {},status=404)
# context_instance = RequestContext(request)) # context_instance = RequestContext(request))
response.status_code = 404 response.status_code = 404
return response return response
def error400_view(request): def error400_view(request, exception):
response = render(request,'400.html', {},status=400) response = render(request,'400.html', {},status=400)
# context_instance = RequestContext(request)) # context_instance = RequestContext(request))

11
rowers/views/workoutviews.py
View File

@@ -1798,7 +1798,10 @@ def workout_downloadwind_view(request,id=0,
windspeed = winddata[0] windspeed = winddata[0]
windbearing = winddata[1] windbearing = winddata[1]
message = winddata[2] message = winddata[2]
row.notes += "\n"+message try:
row.notes += "\n"+message
except TypeError:
pass
row.save() row.save()
rowdata.add_wind(windspeed,windbearing) rowdata.add_wind(windspeed,windbearing)
rowdata.write_csv(f1,gzip=True) rowdata.write_csv(f1,gzip=True)
@@ -1865,7 +1868,11 @@ def workout_downloadmetar_view(request,id=0,
windspeed = winddata[0] windspeed = winddata[0]
windbearing = winddata[1] windbearing = winddata[1]
message = winddata[2] message = winddata[2]
row.notes += "\n"+message try:
row.notes += "\n"+message
except TypeError:
pass
row.save() row.save()
rowdata.add_wind(windspeed,windbearing) rowdata.add_wind(windspeed,windbearing)
rowdata.write_csv(f1,gzip=True) rowdata.write_csv(f1,gzip=True)