diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-14 17:26:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-14 17:26:04 +0200 |
| commit | 8d95f6dcdf6e451f32c247bcabd5ce024a158ebe (patch) | |
| tree | 6e3d989c65a4c7090e313a474122fb426cf40896 /addons/website | |
| parent | e4742f3d1f6b83993f87bbb5a82ff4e01c04bbb0 (diff) | |
| parent | 19b5ba2b08476ea2ede46ab7cf482526c47e62c8 (diff) | |
[MERGE] forward port of branch 8.0 up to 19b5ba2
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website/data/data.xml | 4 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index a5a01d41ae9..9d3e0f3aecb 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -188,7 +188,7 @@ class Website(openerp.addons.web.controllers.main.Home): request.registry['website.menu'].create( request.cr, request.uid, { 'name': path, - 'url': "/page/" + xml_id, + 'url': "/page/" + xml_id[8:], 'parent_id': request.website.menu_id.id, 'website_id': request.website.id, }, context=request.context) diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml index 1c1567a310c..519f01844c6 100644 --- a/addons/website/data/data.xml +++ b/addons/website/data/data.xml @@ -24,7 +24,7 @@ <record id="menu_contactus" model="website.menu"> <field name="name">Contact us</field> - <field name="url">/page/website.contactus</field> + <field name="url">/page/contactus</field> <field name="parent_id" ref="website.main_menu"/> <field name="sequence" type="int">60</field> <field name="website_id" ref="default_website"/> @@ -79,7 +79,7 @@ </record> <record id="action_website_homepage" model="ir.actions.act_url"> <field name="name">Website Homepage</field> - <field name="url">/page/website.homepage</field> + <field name="url">/page/homepage</field> <field name="target">self</field> </record> diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 19292f32467..6fc55be8e96 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -134,16 +134,15 @@ <template id="submenu" name="Submenu"> <li t-if="not submenu.child_id" t-att-class=" - ((submenu.url and submenu.url != '/' and request.httprequest.path.startswith(submenu.url)) or - request.httprequest.path == submenu.url) and 'active' + 'active' if submenu.url and submenu.url != '/' and request.httprequest.path == submenu.url.replace('/page/website.', '/page/') else None "> <a t-att-href="(website.menu_id.child_id[0] == submenu) and '/' or submenu.url" t-ignore="true" t-att-target="'_blank' if submenu.new_window else None"> <span t-field="submenu.name"/> </a> </li> <li t-if="submenu.child_id" t-attf-class="dropdown #{ - ((submenu.url and submenu.url != '/' and [1 for submenu in submenu.child_id if request.httprequest.path.startswith(submenu.url)]) or - request.httprequest.path == submenu.url) and 'active' + (submenu.url and submenu.url != '/' and any([request.httprequest.path == child.url.replace('/page/website.', '/page/') for child in submenu.child_id]) or + request.httprequest.path == submenu.url.replace('/page/website.', '/page/')) and 'active' }"> <a class="dropdown-toggle" data-toggle="dropdown" href="#"> <span t-field="submenu.name"/> <span class="caret" t-ignore="true"></span> |