Changeset 21360c8

Timestamp:

Jun 15, 2014, 9:42:51 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

2e4e1fb

Parents:

f298bd7

git-author:

Alex Dehnert <adehnert@…> (06/15/14 17:59:25)

git-committer:

Alex Dehnert <adehnert@…> (06/15/14 21:42:51)

Message:

Django 1.6: Switch to class-based ListView?

Dango 1.5(?) removed function-based generic views, so we need to switch to the
class-based ones.

Location:

remit

Files:

• urls.py (modified) (2 diffs)
• util/shortcuts.py (modified) (2 diffs)
• vouchers/views.py (modified) (4 diffs)

remit/urls.py

@@ -6 +6 @@
 # Necessary views
 import finance_core.views
+from util.shortcuts import TemplateViewWithContext
 
 # Uncomment the next two lines to enable the admin:
@@ -13 +14 @@
 urlpatterns = patterns('',
     # Example:
-    (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'index.html', 'extra_context': { 'pagename':'homepage' }, }, 'homepage'),
+    url(r'^$', TemplateViewWithContext.as_view(template_name='index.html', extra_context={ 'pagename':'homepage' }), name='homepage'),
     (r'^vouchers/', include('vouchers.urls')),
     (r'^finance_core/', include('finance_core.urls')),

remit/util/shortcuts.py

@@ -2 +2 @@
 from django.template import RequestContext, Template
 from django.template.loader import get_template
+from django.views.generic.base import TemplateView
+from django.views.generic.list import ListView
 
 def get_403_response(request, errmsg=None, **extra_context):
@@ -8 +10 @@
     page = tmpl.render(ctx, )
     return HttpResponseForbidden(page)
+
+
+class ListViewWithContext(ListView):
+    extra_context = {}
+
+    # I believe .queryset will work out-of-the-box
+
+    def get_context_data(self, **kwargs):
+        context = super(ListViewWithContext,self).get_context_data(**kwargs)
+        context.update(self.extra_context)
+        return context
+
+
+class TemplateViewWithContext(TemplateView):
+    extra_context = {}
+
+    def get_context_data(self, **kwargs):
+        context = super(TemplateViewWithContext,self).get_context_data(**kwargs)
+        print context
+        context.update(self.extra_context)

remit/vouchers/views.py

@@ -2 +2 @@
 from vouchers.models import ReimbursementRequest, Documentation
 from finance_core.models import BudgetTerm, BudgetArea
-from util.shortcuts import get_403_response
+from util.shortcuts import get_403_response, ListViewWithContext
 
 from django.contrib.auth.decorators import user_passes_test, login_required
@@ -17 +17 @@
 from django.template import Context, Template
 from django.template.loader import get_template
-from django.views.generic import list_detail
 
 import decimal
@@ -428 +427 @@
 
     # GENERATE THE REQUEST
-    return list_detail.object_list(
-        http_request,
+    callable = ListViewWithContext.as_view(
         queryset=qs,
         extra_context={
@@ -444 +442 @@
         },
     )
+    return callable(http_request)