Ticket #450: dynamic_generics.diff

generic/date_based.py

@@ -2 +2 @@
 from django.core.exceptions import Http404, ObjectDoesNotExist
 from django.core.extensions import DjangoContext as Context
 from django.core.xheaders import populate_xheaders
+from django.views.generic import get_dynamic_lookup
 from django.models import get_module
 from django.utils.httpwrappers import HttpResponse
 import datetime, time
-
+           
 def archive_index(request, app_label, module_name, date_field, num_latest=15,
-                  template_name=None, extra_lookup_kwargs={}, extra_context={}):
+                  template_name=None, extra_lookup_kwargs={}, extra_context={}, **keywds):
     """
     Generic top-level archive of date-based objects.
 
@@ -21 +22 @@
     mod = get_module(app_label, module_name)
     lookup_kwargs = {'%s__lte' % date_field: datetime.datetime.now()}
     lookup_kwargs.update(extra_lookup_kwargs)
+    lookup_kwargs.update(get_dynamic_lookup(keywds))
+    
     date_list = getattr(mod, "get_%s_list" % date_field)('year', **lookup_kwargs)[::-1]
     if not date_list:
         raise Http404("No %s.%s available" % (app_label, module_name))
@@ -49 +52 @@
     return HttpResponse(t.render(c))
 
 def archive_year(request, year, app_label, module_name, date_field,
-                 template_name=None, extra_lookup_kwargs={}, extra_context={}):
+                 template_name=None, extra_lookup_kwargs={}, extra_context={},**keywds):
     """
     Generic yearly archive view.
 
@@ -67 +70 @@
     if int(year) >= now.year:
         lookup_kwargs['%s__lte' % date_field] = now
     lookup_kwargs.update(extra_lookup_kwargs)
+    lookup_kwargs.update(get_dynamic_lookup(keywds))
+    
     date_list = getattr(mod, "get_%s_list" % date_field)('month', **lookup_kwargs)
     if not date_list:
         raise Http404
@@ -86 +91 @@
 
 def archive_month(request, year, month, app_label, module_name, date_field,
                   month_format='%b', template_name=None, extra_lookup_kwargs={},
-                  extra_context={}):
+                  extra_context={},**keywds):
     """
     Generic monthly archive view.
 
@@ -119 +124 @@
     if last_day >= now.date():
         lookup_kwargs['%s__lte' % date_field] = now
     lookup_kwargs.update(extra_lookup_kwargs)
+    lookup_kwargs.update(get_dynamic_lookup(keywds))
     object_list = mod.get_list(**lookup_kwargs)
     if not object_list:
         raise Http404
@@ -138 +144 @@
 
 def archive_day(request, year, month, day, app_label, module_name, date_field,
                 month_format='%b', day_format='%d', template_name=None,
-                extra_lookup_kwargs={}, extra_context={}, allow_empty=False):
+                extra_lookup_kwargs={}, extra_context={}, allow_empty=False,**keywds):
     """
     Generic daily archive view.
 
@@ -167 +173 @@
     if date >= now.date():
         lookup_kwargs['%s__lte' % date_field] = now
     lookup_kwargs.update(extra_lookup_kwargs)
+    lookup_kwargs.update(get_dynamic_lookup(keywds))
     object_list = mod.get_list(**lookup_kwargs)
     if not allow_empty and not object_list:
         raise Http404
@@ -201 +208 @@
 def object_detail(request, year, month, day, app_label, module_name, date_field,
                   month_format='%b', day_format='%d', object_id=None, slug=None,
                   slug_field=None, template_name=None, template_name_field=None,
-                  extra_lookup_kwargs={}, extra_context={}):
+                  extra_lookup_kwargs={}, extra_context={},**keywds):
     """
     Generic detail view from year/month/day/slug or year/month/day/id structure.
 
@@ -230 +237 @@
     else:
         raise AttributeError("Generic detail view must be called with either an object_id or a slug/slugfield")
     lookup_kwargs.update(extra_lookup_kwargs)
+    lookup_kwargs.update(get_dynamic_lookup(keywds))    
     try:
         object = mod.get_object(**lookup_kwargs)
     except ObjectDoesNotExist:

generic/list_detail.py

@@ -5 +5 @@
 from django.core.extensions import DjangoContext as Context
 from django.core.paginator import ObjectPaginator, InvalidPage
 from django.core.exceptions import Http404, ObjectDoesNotExist
+from django.views.generic import get_dynamic_lookup
 
 def object_list(request, app_label, module_name, paginate_by=None, allow_empty=False,
-                template_name=None, extra_lookup_kwargs={}, extra_context={}):
+                template_name=None, extra_lookup_kwargs={}, extra_context={},**kwargs):
     """
     Generic list of objects.
 
@@ -34 +35 @@
     """
     mod = models.get_module(app_label, module_name)
     lookup_kwargs = extra_lookup_kwargs.copy()
+    lookup_kwargs.update(get_dynamic_lookup(keywds))
+    
     if paginate_by:
         paginator = ObjectPaginator(mod, lookup_kwargs, paginate_by)
         page = request.GET.get('page', 0)
@@ -73 +76 @@
 
 def object_detail(request, app_label, module_name, object_id=None, slug=None,
                   slug_field=None, template_name=None, template_name_field=None,
-                  extra_lookup_kwargs={}, extra_context={}):
+                  extra_lookup_kwargs={}, extra_context={},**kwargs):
     """
     Generic list of objects.
 
@@ -91 +94 @@
     else:
         raise AttributeError("Generic detail view must be called with either an object_id or a slug/slug_field")
     lookup_kwargs.update(extra_lookup_kwargs)
+    lookup_kwargs.update(get_dynamic_lookup(keywds))
+    
     try:
         object = mod.get_object(**lookup_kwargs)
     except ObjectDoesNotExist:

generic/__init__.py

@@ +1 @@
+def get_dynamic_lookup(keywords):
+   lookups = {}
+   
+   if keywords.has_key("dynamic_lookup_kwargs"):
+       dynamic_lookup_kwargs = keywords["dynamic_lookup_kwargs"]
+
+       del keywords["dynamic_lookup_kwargs"]
+
+       for lookup, url_keyword in dynamic_lookup_kwargs.items():
+           if keywords.has_key(url_keyword):
+               lookups[lookup] = keywords[url_keyword]
+           else:
+               raise Exception, "dynamic variable %s, was needed but is not defined in the url pattern" % (url_keyword)
+
+   return lookups