odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REM] Obsolete route /admin 

bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
This commit is contained in:
Fabien Meghazi 2013-10-16 11:32:48 +02:00
parent 52ef0032e3
commit 1cec2a5b6f
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/website/controllers/main.py
View File

@ -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'

2
addons/website/static/src/xml/website.xml
View File

@ -35,7 +35,7 @@
</ul>
</li>
<li>
<a href="/admin#action=website.action_module_website">Apps</a>
<a href="/web#action=website.action_module_website">Apps</a>
</li>
</ul>
</div>

6
addons/website/views/website_templates.xml
View File

@ -93,8 +93,8 @@
<div class="collapse navbar-collapse navbar-top-collapse">
<ul class="nav navbar-nav navbar-right" id="top_menu">
<li name="contactus"><a t-href="/page/website.contactus">Contact us</a></li>
<li t-if="user_id.id == website.public_user.id"><a href="/admin">Sign in</a></li>
<li t-if="user_id.id != website.public_user.id"><a href="/admin"><span t-field="user_id.name"/></a></li>
<li t-if="user_id.id == website.public_user.id"><a href="/web">Sign in</a></li>
<li t-if="user_id.id != website.public_user.id"><a href="/web"><span t-field="user_id.name"/></a></li>
<li t-if="request.multilang and
(len(website.language_ids) &gt; 1 or editable)" class="dropdown">
<!-- TODO: use flags for language selection -->
@ -235,7 +235,7 @@
</ul>
</div>
<t t-if="publish_edit">
<a class="btn btn-xs btn-default" title="Edit in backend" t-att-href="'/admin/#model=%s&amp;id=%s' % (object._name, object.id)"><span t-attf-class="glyphicon glyphicon-wrench"></span></a>
<a class="btn btn-xs btn-default" title="Edit in backend" t-att-href="'/web#model=%s&amp;id=%s' % (object._name, object.id)"><span t-attf-class="glyphicon glyphicon-wrench"></span></a>
</t>
</div>
</t>

2
addons/website_blog/controllers/main.py
View File

@ -178,7 +178,7 @@ class WebsiteBlog(http.Controller):
url = request.httprequest.host_url
request.session.body = post.get('body')
if request.context['is_public_user']: # purpose of this ?
return '%s/admin#action=redirect&url=%s/blog/%s/post' % (url, url, blog_post_id)
return '%s/web#action=redirect&url=%s/blog/%s/post' % (url, url, blog_post_id)
if request.session.get('body') and blog_post_id:
request.registry['blog.post'].message_post(

2
addons/website_sale/views/website_sale.xml
View File

@ -623,7 +623,7 @@
<div class="col-md-8 oe_mycart">
<h3 class="page-header mt16">Set Billing Information
<small t-if="user_id.id == website.public_user.id"> or
<a t-if="not partner" t-attf-href="/admin#action=redirect&amp;url=#{ request.httprequest.host_url }/shop/checkout/">sign in</a>
<a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.host_url }/shop/checkout/">sign in</a>
</small>
</h3>
<div class="row">