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

hot fix user account delete

Browse Source
This commit is contained in:
Sander Roosendaal
2018-07-30 11:53:16 +02:00
parent bd67cab1f1
commit 7637522bd4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/interactiveplots.py
View File

@@ -3698,7 +3698,10 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
nrworkouts = len(ids) nrworkouts = len(ids)
tseconds = datadf.ix[:,'time'] try:
tseconds = datadf.ix[:,'time']
except KeyError:
tseconds = datadf.ix[:,xparam]
yparamname = axlabels[yparam] yparamname = axlabels[yparam]

6
rowers/views.py
View File

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