dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #283 from spametki/master

Browse Source 
Fixed wiki get render method
This commit is contained in:
mdipierro
2013-10-26 18:25:44 -07:00
parent af412e7e24 70b3edcbeb
commit 1865c0b1dd
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/languages/es.py
+1
View File
@@ -253,6 +253,7 @@
'New plugin installed: web2py.plugin.attachment.w2p': 'New plugin installed: web2py.plugin.attachment.w2p', '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.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.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': 'Registro nuevo',
'new record inserted': 'nuevo registro insertado', 'new record inserted': 'nuevo registro insertado',
'New simple application': 'Nueva aplicación', 'New simple application': 'Nueva aplicación',
gluon/tools.py
+10 -3
View File
@@ -5245,9 +5245,16 @@ class Wiki(object):
elif callable(self.settings.render): elif callable(self.settings.render):
r = self.settings.render r = self.settings.render
elif isinstance(self.settings.render, dict): elif isinstance(self.settings.render, dict):
return lambda page: self.settings.render.get(page.render, def custom_render(page):
getattr(self, if page.render:
"%s_render" % (page.render or 'markmin')))(page) 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: else:
raise ValueError( raise ValueError(
"Invalid render type %s" % type(self.settings.render)) "Invalid render type %s" % type(self.settings.render))