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

Merge tag 'v7.39' into develop

Browse Source 
hot fix
This commit is contained in:
Sander Roosendaal
2018-07-30 12:30:26 +02:00
parent a0ef41e2fc ad225fcde8
commit 64f4e58d5a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/interactiveplots.py
View File

@@ -3697,9 +3697,12 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
datadf.dropna(axis=0,how='any',inplace=True)
nrworkouts = len(ids)
tseconds = datadf.ix[:,'time']
try:
tseconds = datadf.ix[:,'time']
except KeyError:
tseconds = datadf.ix[:,xparam]
yparamname = axlabels[yparam]
#datadf = datadf[datadf[yparam] > 0]

6
rowers/views.py
View File

@@ -645,7 +645,8 @@ def deactivate_user(request):
deactivate_user = user_form.save(commit=False)
user.is_active = False
deactivate_user.save()
url = reverse(auth_views.logout_then_login)
# url = reverse(auth_views.logout_then_login)
url = '/logout/?next=/login'
return HttpResponseRedirect(url)
return render(request, "userprofile_deactivate.html", {
"user_form": user_form,
@@ -700,7 +701,8 @@ def remove_user(request):
handle_sendemail_userdeleted,
name, email)
url = reverse(auth_views.logout_then_login)
url = '/logout/?next=/login'
# url = reverse(auth_views.logout_then_login)
return HttpResponseRedirect(url)
return render(request, "userprofile_delete.html", {
"user_form": user_form,