summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2012-08-31 21:46:45 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2013-11-18 13:12:58 +0400
commit6daa9d31d98000d8cc87451cdf288624148659f9 (patch)
tree3689cd7e3f66300c53dcc0c29138dcd63b3717e7
parent802e76ccb4b8b0b848b8a35d921b389a696009f1 (diff)
downloadroutes-6daa9d31d98000d8cc87451cdf288624148659f9.tar.gz
Let submappers' children have their own controllers.
-rw-r--r--routes/mapper.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/routes/mapper.py b/routes/mapper.py
index bfcea4a..ecabe89 100644
--- a/routes/mapper.py
+++ b/routes/mapper.py
@@ -160,6 +160,8 @@ class SubMapper(SubMapperParent):
elif key in kwargs:
if isinstance(value, dict):
newkargs[key] = dict(value, **kwargs[key]) # merge dicts
+ elif key == 'controller':
+ newkargs[key] = kwargs[key]
else:
newkargs[key] = value + kwargs[key]
else: