From a6d4e2340e052158f262d9b834cac616d3e2b540 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 1 Feb 2013 21:24:30 -0600 Subject: [PATCH] reverted last change, better to use wiki.menu --- VERSION | 2 +- applications/welcome/models/menu.py | 1 - gluon/tools.py | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index b0e72bcc..e3791167 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.01.21.15.32 +Version 2.4.1-alpha.2+timestamp.2013.02.01.21.23.40 diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py index c303fbe9..87d300a8 100644 --- a/applications/welcome/models/menu.py +++ b/applications/welcome/models/menu.py @@ -10,7 +10,6 @@ response.logo = A(B('web',SPAN(2),'py'),XML('™ '), response.title = ' '.join( word.capitalize() for word in request.application.split('_')) response.subtitle = T('customize me!') -response.masterhad = None ## read more at http://dev.w3.org/html5/markup/meta.name.html response.meta.author = 'Your Name ' diff --git a/gluon/tools.py b/gluon/tools.py index ff723bdf..eb3489b2 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4904,8 +4904,7 @@ class Wiki(object): self.force_prefix = force_prefix % self.auth.user else: self.force_prefix = force_prefix - request = current.request - self.host = request.env.http_host + self.host = current.request.env.http_host perms = self.manage_permissions = manage_permissions self.restrict_search = restrict_search self.extra = extra or {} @@ -4981,16 +4980,12 @@ class Wiki(object): db.wiki_tag.insert(name=tag, wiki_page=page.id) db.wiki_page._after_insert.append(update_tags_insert) db.wiki_page._after_update.append(update_tags_update) - if auth.user and check_credentials(request) and \ + if auth.user and check_credentials(current.request) and \ not 'wiki_editor' in auth.user_groups.values(): group = db.auth_group(role='wiki_editor') gid = group.id if group else db.auth_group.insert( role='wiki_editor') auth.add_membership(gid) - - automenu = self.menu(request.controller, request.function) - current.response.menu += automenu - # WIKI ACCESS POLICY def not_authorized(self, page=None): @@ -5039,6 +5034,8 @@ class Wiki(object): def __call__(self): request = current.request + automenu = self.menu(request.controller, request.function) + current.response.menu += automenu zero = request.args(0) or 'index' if zero and zero.isdigit(): return self.media(int(zero))