From 70b3edcbeb5f56909b93f0df46273f5981a33f31 Mon Sep 17 00:00:00 2001 From: spametki Date: Sat, 26 Oct 2013 21:39:26 -0300 Subject: [PATCH] Fixed wiki get render method --- applications/admin/languages/es.py | 1 + gluon/tools.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/applications/admin/languages/es.py b/applications/admin/languages/es.py index 39875970..7925f7cf 100644 --- a/applications/admin/languages/es.py +++ b/applications/admin/languages/es.py @@ -253,6 +253,7 @@ 'New plugin installed: web2py.plugin.attachment.w2p': 'New plugin installed: web2py.plugin.attachment.w2p', 'New plugin installed: web2py.plugin.dialog.w2p': 'New plugin installed: web2py.plugin.dialog.w2p', 'New plugin installed: web2py.plugin.math2py.w2p': 'New plugin installed: web2py.plugin.math2py.w2p', +'New plugin installed: web2py.plugin.timezone.w2p': 'New plugin installed: web2py.plugin.timezone.w2p', 'New Record': 'Registro nuevo', 'new record inserted': 'nuevo registro insertado', 'New simple application': 'Nueva aplicación', diff --git a/gluon/tools.py b/gluon/tools.py index 3680ac76..af3c713c 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -5245,9 +5245,16 @@ class Wiki(object): elif callable(self.settings.render): r = self.settings.render elif isinstance(self.settings.render, dict): - return lambda page: self.settings.render.get(page.render, - getattr(self, - "%s_render" % (page.render or 'markmin')))(page) + def custom_render(page): + if page.render: + if page.render in self.settings.render.keys(): + my_render = self.settings.render[page.render] + else: + my_render = getattr(self, "%s_render" % page.render) + else: + my_render = self.markmin_render + return my_render(page) + r = custom_render else: raise ValueError( "Invalid render type %s" % type(self.settings.render))