Merge branch 'hotfix/v7.39'

rowers/interactiveplots.py

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

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,