From 7637522bd4ad773350c737614cc1170abb71dbfc Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 30 Jul 2018 11:53:16 +0200 Subject: [PATCH] hot fix user account delete --- rowers/interactiveplots.py | 7 +++++-- rowers/views.py | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 5c433730..e305250b 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -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] diff --git a/rowers/views.py b/rowers/views.py index 1823f72e..6a5681c6 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -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,