From 9d83a5b19ca882228f496a2a49c8af504bdaebf2 Mon Sep 17 00:00:00 2001 From: Trever Fischer Date: Sat, 21 Apr 2012 12:42:31 -0400 Subject: [PATCH] crash-- --- local/context.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/local/context.py b/local/context.py index b61787e..321d792 100644 --- a/local/context.py +++ b/local/context.py @@ -22,10 +22,14 @@ def login_form(request): def donation_info(request): now = datetime.now() monthStart = datetime(now.year, now.month, 1) - donations = Donation.objects.filter(created__gt=monthStart).aggregate(Sum('quantity'))['quantity__sum'] + donations = Donation.objects.filter(created__gt=monthStart).aggregate(Sum('quantity')) goal = getattr(settings, 'CAMINUS_DONATION_GOAL', 0) - if donations > goal: + donationTotal = donations['quantity__sum'] + if donationTotal is None: + progress = 0 + donationTotal = 0 + if donationTotal> goal: progress = 100 else: - progress = donations/goal*100 - return {'donation_month_total': donations, 'donation_month_goal': goal, 'donation_goal_progress': progress} + progress = donationTotal/goal*100 + return {'donation_month_total': donationTotal, 'donation_month_goal': goal, 'donation_goal_progress': progress}