replan by weeks fixing #417

rowers/views.py

@@ -742,31 +742,33 @@ def deactivate_user(request):
         if request.method == "POST":
             user_form = DeactivateUserForm(request.POST, instance=user)
             if user_form.is_valid():
-                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
+                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()
+                        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)
+                    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,
         })
@@ -19344,7 +19346,6 @@ def allsundays(startdate,enddate):
                   message="This functionality requires a Coach or Self-Coach plan",
                   redirect_field_name=None)
 def planmesocyclebyweek(request,id=0,userid=0):
-    print 'planning by week'
     try:
         cycle = TrainingMesoCycle.objects.get(id=id)
     except TrainingMesoCycle.DoesNotExist:
@@ -19365,7 +19366,7 @@ def planmesocyclebyweek(request,id=0,userid=0):
 
     if sundays and sundays[-1] < cycle.enddate:
         sundays = sundays+[cycle.enddate]
-    else:
+    elif not sundays:
         sundays = [cycle.enddate]
         
     for i in range(len(sundays)):