From 7318a269ab72366670f45804328c3cb2bd23acd5 Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Mon, 9 Aug 2010 07:50:51 -0400 Subject: [PATCH] Multiview will now pass node and extra_context to any view that takes kwargs. Fixes bug #10 --- models/nodes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/nodes.py b/models/nodes.py index f84565d..56cbb12 100644 --- a/models/nodes.py +++ b/models/nodes.py @@ -73,12 +73,12 @@ class MultiView(View): subpath = "" subpath = "/" + subpath view, args, kwargs = resolve(subpath, urlconf=self) - view_args = getargspec(view)[0] - if extra_context is not None and 'extra_context' in view_args: + view_args = getargspec(view) + if extra_context is not None and ('extra_context' in view_args[0] or view_args[2] is not None): if 'extra_context' in kwargs: extra_context.update(kwargs['extra_context']) kwargs['extra_context'] = extra_context - if 'node' in view_args: + if 'node' in view_args[0] or view_args[2] is not None: kwargs['node'] = node return view(request, *args, **kwargs) -- 2.20.1