From 7d53ec6d7169115380817eb7ba4b81d07dfbd218 Mon Sep 17 00:00:00 2001 From: Massimo Date: Fri, 12 Apr 2013 10:31:55 -0500 Subject: [PATCH] fixed loading or routes on winservice, thanks Stephen Tanner --- VERSION | 2 +- applications/welcome/models/menu.py | 8 -------- gluon/winservice.py | 2 ++ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index b39c12c1..f955a099 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.04.10.22.14.20 +Version 2.4.6-stable+timestamp.2013.04.12.10.30.59 diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py index a9930ed8..a33e3639 100644 --- a/applications/welcome/models/menu.py +++ b/applications/welcome/models/menu.py @@ -138,12 +138,4 @@ def _(): if DEVELOPMENT_MENU: _() -######################################################################### -## This adds the wiki menu to any action if specified in wiki settings. -######################################################################### - -if "auth" in locals(): - if auth.settings.wiki.controller and auth.settings.wiki.function: - auth.wiki(controller=auth.settings.wiki.controller, - function=auth.settings.wiki.function) diff --git a/gluon/winservice.py b/gluon/winservice.py index c5ee76b2..e08f3132 100644 --- a/gluon/winservice.py +++ b/gluon/winservice.py @@ -136,6 +136,8 @@ class Web2pyService(Service): path=options.folder ) try: + from rewrite import load + load() self.server.start() except: