Move source names to a model.

[wolnelektury.git] / apps / funding / views.py

diff --git a/apps/funding/views.py b/apps/funding/views.py
index 581a64e..9dd18cc 100644 (file)
--- a/apps/funding/views.py
+++ b/apps/funding/views.py
@@ -2,16 +2,13 @@
 # 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 Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from datetime import date
-from django.views.decorators.cache import never_cache
-from django.conf import settings

 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import redirect, get_object_or_404
 from django.views.decorators.csrf import csrf_exempt
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import redirect, get_object_or_404
 from django.views.decorators.csrf import csrf_exempt

-from django.views.generic import TemplateView, FormView, DetailView, ListView
-import getpaid.backends.payu
+from django.views.generic import TemplateView, FormView, ListView

 from getpaid.models import Payment
 from getpaid.models import Payment

+from . import app_settings

 from .forms import FundingForm
 from .models import Offer, Spent, Funding
 
 from .forms import FundingForm
 from .models import Offer, Spent, Funding
 


@@ -52,7 +49,7 @@ class WLFundView(TemplateView):
 
         ctx = super(WLFundView, self).get_context_data()
         offers = []
 
         ctx = super(WLFundView, self).get_context_data()
         offers = []

-        
+

         for o in Offer.past():
             if o.is_win():
                 o.wlfund = o.sum() - o.target
         for o in Offer.past():
             if o.is_win():
                 o.wlfund = o.sum() - o.target


@@ -92,7 +89,7 @@ class OfferDetailView(FormView):
         if self.request.method == 'POST':
             return form_class(self.object, self.request.POST)
         else:
         if self.request.method == 'POST':
             return form_class(self.object, self.request.POST)
         else:

-            return form_class(self.object, initial={'amount': settings.FUNDING_DEFAULT})
+            return form_class(self.object, initial={'amount': app_settings.DEFAULT_AMOUNT})

 
     def get_context_data(self, *args, **kwargs):
         ctx = super(OfferDetailView, self).get_context_data(*args, **kwargs)
 
     def get_context_data(self, *args, **kwargs):
         ctx = super(OfferDetailView, self).get_context_data(*args, **kwargs)


@@ -115,7 +112,7 @@ class CurrentView(OfferDetailView):
     def dispatch(self, request, slug=None):
         self.object = Offer.current()
         if self.object is None:
     def dispatch(self, request, slug=None):
         self.object = Offer.current()
         if self.object is None:

-            raise Http404
+            return redirect(reverse('funding'))

         elif slug != self.object.slug:
             return redirect(reverse('funding_current', args=[self.object.slug]))
         return super(CurrentView, self).dispatch(request, slug)
         elif slug != self.object.slug:
             return redirect(reverse('funding_current', args=[self.object.slug]))
         return super(CurrentView, self).dispatch(request, slug)


@@ -149,7 +146,7 @@ class DisableNotifications(TemplateView):
 
     @csrf_exempt
     def dispatch(self, request):
 
     @csrf_exempt
     def dispatch(self, request):

-        self.object = get_object_or_404(Funding, 
+        self.object = get_object_or_404(Funding,

             email=request.GET.get('email'), notify_key=request.GET.get('key'))
         return super(DisableNotifications, self).dispatch(request)
 
             email=request.GET.get('email'), notify_key=request.GET.get('key'))
         return super(DisableNotifications, self).dispatch(request)