X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9bc86f5a6542c5893ac94284da33162a7c7be2d6..59b18d2848d2561f1547b78921936a501d0f0b37:/src/funding/views.py diff --git a/src/funding/views.py b/src/funding/views.py index 315c3da49..5be8c4b89 100644 --- a/src/funding/views.py +++ b/src/funding/views.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render @@ -51,20 +51,15 @@ class WLFundView(TemplateView): offers = [] for o in Offer.past(): - if o.is_win(): - o.wlfund = o.sum() - o.target - if o.wlfund > 0: - offers.append(o) - else: - o.wlfund = o.sum() - if o.wlfund > 0: - offers.append(o) + o.wlfund = o.sum() + if o.wlfund > 0: + offers.append(o) amount = sum(o.wlfund for o in offers) - sum(o.amount for o in Spent.objects.all()) ctx['amount'] = amount ctx['log'] = add_total(amount, mix( - (offers, lambda x: x.end, 'offer'), (Spent.objects.all().select_related(), lambda x: x.timestamp, 'spent'), + (offers, lambda x: x.end, 'offer'), )) return ctx