summaryrefslogtreecommitdiff
path: root/addons/website/controllers
diff options
context:
space:
mode:
authorbth-openerp <bth@tinyerp.com>2013-10-17 18:41:39 +0530
committerbth-openerp <bth@tinyerp.com>2013-10-17 18:41:39 +0530
commitaddc2d5f9cefc4c7cd1eb7f3abcc496f2c8eeabe (patch)
tree9bcb89044f3ca6854b2942206b73653f52859e84 /addons/website/controllers
parente3d3cf674c461b2d39418b98898e21d32c08a20d (diff)
parentd5bbf2501a08dd6b0bab0ea4e2e9ff4b0b03fed7 (diff)
[MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131017131139-whjjmuin6g9cby9r
Diffstat (limited to 'addons/website/controllers')
-rw-r--r--addons/website/controllers/main.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index baa6b6c780b..083f9f3aef7 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -51,11 +51,7 @@ class Website(openerp.addons.web.controllers.main.Home):
def index(self, **kw):
return self.page("website.homepage")
- @http.route('/admin', type='http', auth="none")
- def admin(self, *args, **kw):
- return super(Website, self).index(*args, **kw)
-
- # FIXME: auth, if /pagenew known anybody can create new empty page
+ # FIXME: auth, if /pagenew known anybody can create new empty page
@website.route('/pagenew/<path:path>', type='http', auth="admin")
def pagenew(self, path, noredirect=NOPE):
module = 'website'