diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2013-05-18 05:14:28 -0700 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2013-05-18 05:14:28 -0700 |
| commit | ef73a8eefd2c4836ca2badc67c3b9aa9a0add7bd (patch) | |
| tree | 6aa5964ec52c88acbdb83a7862c31b9f69fdf24c /django | |
| parent | be826aafacb9fe266209604116efe128a0b4cdc0 (diff) | |
| parent | 1c921cfac34daa9c18e4e235e20fa7beb8929f1c (diff) | |
Merge pull request #1083 from Markush2010/ticket20235
Fixes #20235 - MultipleObjectMixin requires object_list in kwargs
Diffstat (limited to 'django')
| -rw-r--r-- | django/views/generic/list.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/views/generic/list.py b/django/views/generic/list.py index 08c4bbcda0..1aff3454f4 100644 --- a/django/views/generic/list.py +++ b/django/views/generic/list.py @@ -105,7 +105,7 @@ class MultipleObjectMixin(ContextMixin): """ Get the context for this view. """ - queryset = kwargs.pop('object_list') + queryset = kwargs.pop('object_list', self.object_list) page_size = self.get_paginate_by(queryset) context_object_name = self.get_context_object_name(queryset) if page_size: @@ -149,7 +149,7 @@ class BaseListView(MultipleObjectMixin, View): if is_empty: raise Http404(_("Empty list and '%(class_name)s.allow_empty' is False.") % {'class_name': self.__class__.__name__}) - context = self.get_context_data(object_list=self.object_list) + context = self.get_context_data() return self.render_to_response(context) |