summaryrefslogtreecommitdiff
path: root/addons/website/data
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2014-02-13 13:06:02 +0100
committerThibault Delavallée <tde@openerp.com>2014-02-13 13:06:02 +0100
commit605f49f2e101d4e64e8ae344ab95598f2fc287a4 (patch)
tree3fbe83c33793e4ebb40eaa15a96033e790cef26c /addons/website/data
parentc02a51088992ee1bf4bf2819c6919ae8c552eb3c (diff)
parentdf313af40953259e6eec11043002f6e876457270 (diff)
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140213120602-fuai78kcqwb8vijg
Diffstat (limited to 'addons/website/data')
-rw-r--r--addons/website/data/website_data.xml2
-rw-r--r--addons/website/data/website_demo.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 50f2d8e381e..4eff1b8a60d 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -59,7 +59,7 @@
</record>
<record id="action_website_tutorial" model="ir.actions.act_url">
<field name="name">Website With Tutorial</field>
- <field name="url">/?tutorial.banner=true</field>
+ <field name="url">/#tutorial.banner=true</field>
<field name="target">self</field>
</record>
<record id="action_website_homepage" model="ir.actions.act_url">
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index a7fa4d76a07..6f37b871100 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -43,6 +43,7 @@
<field name="name">Website Partner Post and Thanks Demo</field>
<field name="condition">True</field>
<field name="website_published" eval="True"/>
+ <field name="website_path">partner_thanks</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="code">
partner_id, partner = False, None
@@ -118,6 +119,7 @@ response = request.website.render("website.template_partner_post", values)
<field name="name">Website Partners Comment Form</field>
<field name="condition">True</field>
<field name="website_published" eval="True"/>
+ <field name="website_path">partner_comment</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="code">
partner_ids = pool['res.partner'].search(cr, uid, [('customer', '=', True)], context=context)