Merge branch 'release/v20.5.11'
This commit is contained in:
@@ -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',
|
||||
|
||||
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user