From dffa3543f58762e6995d818cf7c811f6a0c95b32 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 15 Sep 2014 10:50:27 +0200
Subject: [PATCH] [IMP] misc changes
---
addons/website/controllers/main.py | 6 ++----
addons/website/data/demo.xml | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 63465d6ad888..5e3cc68a53ba 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -164,13 +164,11 @@ class Website(openerp.addons.web.controllers.main.Home):
def pagenew(self, path, noredirect=False, add_menu=None):
xml_id = request.registry['website'].new_page(request.cr, request.uid, path, context=request.context)
if add_menu:
- current = request.website
- new_menu_id = current.menu_id.id
request.registry['website.menu'].create(request.cr, request.uid, {
'name': path,
'url': "/page/" + xml_id,
- 'parent_id': new_menu_id,
- 'website_id': current.id,
+ 'parent_id': request.website.menu_id.id,
+ 'website_id': request.website.id,
}, context=request.context)
# Reverse action in order to allow shortcut for /page/<website_xml_id>
url = "/page/" + re.sub(r"^website\.", '', xml_id)
diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml
index 6463ea928454..e72c05dc933b 100644
--- a/addons/website/data/demo.xml
+++ b/addons/website/data/demo.xml
@@ -148,8 +148,7 @@ response = request.render("website.template_partner_comment", values)
<field name="type">qweb</field>
<field name="key">website.homepage</field>
<field name="website_id" ref="website2"/>
- <field name="arch">
- <![CDATA[
+ <field name="arch" type="xml">
<t name="Homepage" priority="29" t-name="website.homepage">
<t t-call="website.layout">
<div id="wrap" class="oe_structure oe_empty">
@@ -183,7 +182,6 @@ response = request.render("website.template_partner_comment", values)
</div>
</t>
</t>
- ]]>
</field>
</record>
--
GitLab