git.ithinksw.org
/
philo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3037e2
)
Multiview will now pass node and extra_context to any view that takes kwargs. Fixes...
author
Stephen Burrows
<stephen.r.burrows@gmail.com>
Mon, 9 Aug 2010 11:50:51 +0000
(07:50 -0400)
committer
Stephen Burrows
<stephen.r.burrows@gmail.com>
Mon, 9 Aug 2010 11:50:51 +0000
(07:50 -0400)
models/nodes.py
patch
|
blob
|
history
diff --git
a/models/nodes.py
b/models/nodes.py
index
f84565d
..
56cbb12
100644
(file)
--- 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)
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 '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)
kwargs['node'] = node
return view(request, *args, **kwargs)