diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
| commit | c8cc54559b75a621e4444ecdca6abd901b45e494 (patch) | |
| tree | 92141325d4dbbf70bbfb8e0c040d4435c8d2378f /addons/website/data | |
| parent | b2804b1d2ae5fd7ec5c0eca79a8db77476badc84 (diff) | |
| parent | 91a14488250bc2bb405cc6d300359aa272642484 (diff) | |
[MERGE] forward port branch 10.0 up to 91a1448
Diffstat (limited to 'addons/website/data')
| -rw-r--r-- | addons/website/data/website_data.xml | 19 | ||||
| -rw-r--r-- | addons/website/data/website_demo.xml | 3 |
2 files changed, 4 insertions, 18 deletions
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index 722a1d17ca9..cef9cc4b437 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -2,7 +2,7 @@ <odoo> <data noupdate="1"> <record id="default_website" model="website"> - <field name="name">Website localhost</field> + <field name="name">My Website</field> <field name="domain">localhost</field> <field name="company_id" ref="base.main_company"/> <field name="user_id" ref="base.public_user"/> @@ -30,23 +30,6 @@ <field name="website_id" ref="default_website"/> </record> - <record id="group_website_publisher" model="res.groups"> - <field name="name">Editor</field> - <field name="category_id" ref="base.module_category_website"/> - </record> - - <!-- Access rules to edit ir.ui.view with qWeb type --> - <record id="group_website_designer" model="res.groups"> - <field name="name">Editor and Designer</field> - <field name="users" eval="[(4, ref('base.user_root'))]"/> - <field name="implied_ids" eval="[(4, ref('group_website_publisher'))]"/> - <field name="category_id" ref="base.module_category_website"/> - </record> - - <record id="base.default_user" model="res.users"> - <field name="groups_id" eval="[(4,ref('group_website_designer'))]"/> - </record> - <record id="action_module_website" model="ir.actions.act_window"> <field name="name">Website Apps</field> <field name="res_model">ir.module.module</field> diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml index c975d8580e8..14d88295ab4 100644 --- a/addons/website/data/website_demo.xml +++ b/addons/website/data/website_demo.xml @@ -128,6 +128,9 @@ response = request.render("website.template_partner_comment", { <field name="type">ir.actions.server</field> </record> + <record id="default_website" model="website"> + <field name="name">Website localhost</field> + </record> <record id="website2" model="website"> <field name="name">Website 0.0.0.0</field> <field name="domain">0.0.0.0</field> |