Fixed #1399 -- Added template_object_name hook to generic views. Thanks, ChaosKCW

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2453 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 16 insertions, 15 deletions

diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py
index 7ddde87650..8c9463b24a 100644
--- a/django/views/generic/create_update.py
+++ b/django/views/generic/create_update.py
@@ -73,7 +73,8 @@ def create_object(request, app_label, module_name, template_name=None,
 def update_object(request, app_label, module_name, object_id=None, slug=None,
         slug_field=None, template_name=None, template_loader=loader,
         extra_lookup_kwargs={}, extra_context={}, post_save_redirect=None,
-        login_required=False, follow=None, context_processors=None):
+        login_required=False, follow=None, context_processors=None,
+        template_object_name='object'):
     """
     Generic object-update function.
 
@@ -133,7 +134,7 @@ def update_object(request, app_label, module_name, object_id=None, slug=None,
     t = template_loader.get_template(template_name)
     c = DjangoContext(request, {
         'form': form,
-        'object': object,
+        template_object_name: object,
     }, context_processors)
     for key, value in extra_context.items():
         if callable(value):
@@ -147,7 +148,7 @@ def update_object(request, app_label, module_name, object_id=None, slug=None,
 def delete_object(request, app_label, module_name, post_delete_redirect,
         object_id=None, slug=None, slug_field=None, template_name=None,
         template_loader=loader, extra_lookup_kwargs={}, extra_context={},
-        login_required=False, context_processors=None):
+        login_required=False, context_processors=None, template_object_name='object'):
     """
     Generic object-delete function.
 
@@ -189,7 +190,7 @@ def delete_object(request, app_label, module_name, post_delete_redirect,
             template_name = "%s/%s_confirm_delete" % (app_label, module_name)
         t = template_loader.get_template(template_name)
         c = DjangoContext(request, {
-            'object': object,
+            template_object_name: object,
         }, context_processors)
         for key, value in extra_context.items():
             if callable(value):
diff --git a/django/views/generic/date_based.py b/django/views/generic/date_based.py
index c02e545ed5..9b9a3034ba 100644
--- a/django/views/generic/date_based.py
+++ b/django/views/generic/date_based.py
@@ -89,7 +89,7 @@ def archive_year(request, year, app_label, module_name, date_field,
 def archive_month(request, year, month, app_label, module_name, date_field,
         month_format='%b', template_name=None, template_loader=loader,
         extra_lookup_kwargs={}, extra_context={}, allow_empty=False,
-        context_processors=None):
+        context_processors=None, template_object_name='object'):
     """
     Generic monthly archive view.
 
@@ -129,7 +129,7 @@ def archive_month(request, year, month, app_label, module_name, date_field,
         template_name = "%s/%s_archive_month" % (app_label, module_name)
     t = template_loader.get_template(template_name)
     c = DjangoContext(request, {
-        'object_list': object_list,
+        '%s_list' % template_object_name: object_list,
         'month': date,
         'next_month': (last_day < datetime.date.today()) and (last_day + datetime.timedelta(days=1)) or None,
         'previous_month': first_day - datetime.timedelta(days=1),
@@ -144,7 +144,7 @@ def archive_month(request, year, month, app_label, module_name, date_field,
 def archive_day(request, year, month, day, app_label, module_name, date_field,
         month_format='%b', day_format='%d', template_name=None,
         template_loader=loader, extra_lookup_kwargs={}, extra_context={},
-        allow_empty=False, context_processors=None):
+        allow_empty=False, context_processors=None, template_object_name='object'):
     """
     Generic daily archive view.
 
@@ -180,7 +180,7 @@ def archive_day(request, year, month, day, app_label, module_name, date_field,
         template_name = "%s/%s_archive_day" % (app_label, module_name)
     t = template_loader.get_template(template_name)
     c = DjangoContext(request, {
-        'object_list': object_list,
+        '%s_list' % template_object_name: object_list,
         'day': date,
         'previous_day': date - datetime.timedelta(days=1),
         'next_day': (date < datetime.date.today()) and (date + datetime.timedelta(days=1)) or None,
@@ -208,7 +208,7 @@ 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,
         template_loader=loader, extra_lookup_kwargs={}, extra_context={},
-        context_processors=None):
+        context_processors=None, template_object_name='object'):
     """
     Generic detail view from year/month/day/slug or year/month/day/id structure.
 
@@ -249,7 +249,7 @@ def object_detail(request, year, month, day, app_label, module_name, date_field,
     else:
         t = template_loader.get_template(template_name)
     c = DjangoContext(request, {
-        'object': object,
+        template_object_name: object,
     }, context_processors)
     for key, value in extra_context.items():
         if callable(value):
diff --git a/django/views/generic/list_detail.py b/django/views/generic/list_detail.py
index f76b984be1..5cc496f5ed 100644
--- a/django/views/generic/list_detail.py
+++ b/django/views/generic/list_detail.py
@@ -8,7 +8,7 @@ from django.core.exceptions import Http404, ObjectDoesNotExist
 
 def object_list(request, app_label, module_name, paginate_by=None, allow_empty=False,
         template_name=None, template_loader=loader, extra_lookup_kwargs={},
-        extra_context={}, context_processors=None):
+        extra_context={}, context_processors=None, template_object_name='object'):
     """
     Generic list of objects.
 
@@ -49,7 +49,7 @@ def object_list(request, app_label, module_name, paginate_by=None, allow_empty=F
             else:
                 raise Http404
         c = DjangoContext(request, {
-            'object_list': object_list,
+            '%s_list' % template_object_name: object_list,
             'is_paginated': paginator.pages > 1,
             'results_per_page': paginate_by,
             'has_next': paginator.has_next_page(page - 1),
@@ -63,7 +63,7 @@ def object_list(request, app_label, module_name, paginate_by=None, allow_empty=F
     else:
         object_list = mod.get_list(**lookup_kwargs)
         c = DjangoContext(request, {
-            'object_list': object_list,
+            '%s_list' % template_object_name: object_list,
             'is_paginated': False
         }, context_processors)
         if len(object_list) == 0 and not allow_empty:
@@ -81,7 +81,7 @@ def object_list(request, app_label, module_name, paginate_by=None, allow_empty=F
 def object_detail(request, app_label, module_name, object_id=None, slug=None,
         slug_field=None, template_name=None, template_name_field=None,
         template_loader=loader, extra_lookup_kwargs={}, extra_context={},
-        context_processors=None):
+        context_processors=None, template_object_name='object'):
     """
     Generic list of objects.
 
@@ -111,7 +111,7 @@ def object_detail(request, app_label, module_name, object_id=None, slug=None,
     else:
         t = template_loader.get_template(template_name)
     c = DjangoContext(request, {
-        'object': object,
+        template_object_name: object,
     }, context_processors)
     for key, value in extra_context.items():
         if callable(value):