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

Merge pull request #369 from spametki/issue1828

Browse Source 
Fixes issue1828
This commit is contained in:
mdipierro
2014-01-30 06:06:34 -08:00
parent efcb203dd9 82a8d41ac6
commit 4cd86a397c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gluon/tools.py
View File

@@ -3659,9 +3659,8 @@ class Auth(object):
# resolve=False allows initial setup without wiki redirection
wiki = None
if resolve:
action = str(current.request.args(0)).startswith("_")
if slug and not action:
wiki = self._wiki.read(slug,force_render)
if slug:
wiki = self._wiki.read(slug, force_render)
if isinstance(wiki, dict) and wiki.has_key('content'):
# We don't want to return a dict object, just the wiki
wiki = wiki['content']
@@ -5520,13 +5519,11 @@ class Wiki(object):
elif slug in '_search':
return self.search()
page = self.auth.db.wiki_page(slug=slug)
if not page:
redirect(URL(args=('_create', slug)))
if not self.can_read(page):
if page and (not self.can_read(page)):
return self.not_authorized(page)
if current.request.extension == 'html':
if not page:
url = URL(args=('_edit', slug))
url = URL(args=('_create', slug))
return dict(content=A('Create page "%s"' % slug, _href=url, _class="btn"))
else:
html = page.html if not force_render else self.get_renderer()(page)