a few more links checked

rowers/views/otherviews.py

@@ -49,8 +49,8 @@ def failed_queue_empty(request):
     q.empty()
 
     return HttpResponseRedirect(reverse('failed_queue_view'))
-    
-    
+
+
 @login_required()
 def failed_job_view(request,id=0):
     if not request.user.is_staff:
@@ -62,7 +62,7 @@ def failed_job_view(request,id=0):
     thejob.delete()
 
     return HttpResponseRedirect(reverse('failed_queue_view'))
-    
+
 
 @login_required()
 def errormessage_view(request,errormessage='aap'):
@@ -74,120 +74,6 @@ def errormessage_view(request,errormessage='aap'):
         "result":1,
         })
 
-@login_required()
-def deactivate_user(request):
-    pk = request.user.id
-    user = User.objects.get(pk=pk)
-    user_form = DeactivateUserForm(instance=user)
-    if request.user.is_authenticated and request.user.id == user.id:
-        if request.method == "POST":
-            user_form = DeactivateUserForm(request.POST, instance=user)
-            if user_form.is_valid():
-                if not user_form.cleaned_data['is_active']:
-                    r = Rower.objects.get(user=user)
-                    if r.paidplan is not None and r.paidplan.paymentprocessor == 'braintree':
-                        try:
-                            subscriptions = braintreestuff.find_subscriptions(r)
-                            for subscription in subscriptions:
-                                success, themessages,errormessages = braintreestuff.cancel_subscription(r,id)
-                                for message in themessages:
-                                    messages.info(request,message)
-                        except ProcessorCustomerError:
-                            pass
-
-                        r.paidplan = None
-                        r.teamplanexpires = timezone.now()
-                        r.planexpires = timezone.now()
-                        r.clubsize = 0
-                        r.rowerplan = 'basic'
-                        r.save()
-
-                    deactivate_user = user_form.save(commit=False)
-                    user.is_active = False
-                    user.save()
-                    deactivate_user.save()
-                    #                url = reverse(auth_views.logout_then_login)
-                    url = '/logout/?next=/login'
-                    return HttpResponseRedirect(url)
-                
-        return render(request, "userprofile_deactivate.html", {
-            "user_form": user_form,
-        })
-    else:
-        raise PermissionDenied    
-
-@login_required()
-def user_gdpr_optin(request):
-    r = getrower(request.user)
-    r.gdproptin = False
-    r.gdproptindate = None
-    r.save()
-    nexturl = request.GET.get('next','/rowers/list-workouts/')
-    if r.gdproptin:
-        return HttpResponseRedirect(nexturl)
-
-    return render(request,'gdpr_optin.html',{
-        "next": nexturl
-        })
-
-@login_required()
-def user_gdpr_confirm(request):
-    r = getrower(request.user)
-    r.gdproptin = True
-    r.gdproptindate = timezone.now()
-    r.save()
-
-    nexturl = request.GET.get('next','/rowers/list-workouts/')
-
-    return HttpResponseRedirect(nexturl)
-                  
-        
-    
-@login_required()
-def remove_user(request):
-    pk = request.user.id
-    user = User.objects.get(pk=pk)
-    user_form = DeleteUserForm(instance=user)
-    if request.user.is_authenticated and request.user.id == user.id:
-        if request.method == "POST":
-            user_form = DeleteUserForm(request.POST,instance=user)
-            if user_form.is_valid():
-                cd = user_form.cleaned_data
-                name = user.first_name+' '+user.last_name
-                email = user.email
-
-                r = Rower.objects.get(user=user)
-                if r.paidplan is not None and r.paidplan.paymentprocessor == 'braintree':
-                    try:
-                        subscriptions = braintreestuff.find_subscriptions(r)
-                        for subscription in subscriptions:
-                            success, themessages,errormessages = braintreestuff.cancel_subscription(r,id)
-                        for message in themessages:
-                            messages.info(request,message)
-                    except:
-                        pass
-                        
-                if cd['delete_user']:
-                    # delete workouts
-                    Workout.objects.filter(user=user.rower).delete()
-                    # delete planned sessions
-                    PlannedSession.objects.filter(manager=user).delete()
-                    
-                    user.delete()
-                    res = myqueue(queuehigh,
-                                  handle_sendemail_userdeleted,
-                                  name, email)
-
-                    url = '/logout/?next=/login'
-#                    url = reverse(auth_views.logout_then_login)
-                    return HttpResponseRedirect(url)
-        return render(request, "userprofile_delete.html", {
-            "user_form": user_form,
-            })
-    else:
-        raise PermissionDenied
-    
-
 
 # Shows analysis page
 @login_required()
@@ -200,7 +86,7 @@ def analysis_view(request,userid=0):
                       'rower':r,
                   }
                   )
-    
+
 # Shows laboratory page
 @login_required()
 def laboratory_view(request,userid=0):
@@ -212,9 +98,3 @@ def laboratory_view(request,userid=0):
                       'rower':r,
                   }
                   )
-    
-
-        
-
-
-