diff --git a/rowers/integrations/c2.py b/rowers/integrations/c2.py index b7fee546..1a7268ea 100644 --- a/rowers/integrations/c2.py +++ b/rowers/integrations/c2.py @@ -209,7 +209,7 @@ class C2Integration(SyncIntegration): spmav = 0 try: hrav = int(row.df[' HRCur (bpm)'][mask].mean()) - except ValuError: + except ValueError: hrav = 0 intervaldict = { 'type': 'distance', diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 0c2f2608..4d5ff824 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index 9b54615b..dbf08d5e 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -262,13 +262,16 @@ def user_message_delete(request,id=0): try: msg = UserMessage.objects.get(id=id) except UserMessage.DoesNotExist: - pass + messages.error(request,'Could not find this message') + url = reverse('user_messages') + return HttpResponseRedirect(url) + if msg.receiver == request.user.rower: msg.delete() messages.info(request,'Deleted message {id}'.format(id=id)) else: - messages.error('You are not allowed to delete this message') + messages.error(request,'You are not allowed to delete this message') url = reverse('user_messages') return HttpResponseRedirect(url)