diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-02-20 18:16:01 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-02-20 18:16:01 +0100 |
| commit | aec02cb4935103aa7d158b56397c191932b35fa7 (patch) | |
| tree | 82915059f96448510e6b1c5183611175c483e579 /addons/website_forum | |
| parent | e13923c0db1fd4ba9c98eacdcd987c6be7575a5f (diff) | |
| parent | d350f5b59e8905a76e965b6f34a0db14dbb53af0 (diff) | |
[MERGE] forward port of branch 8.0 up to d350f5b
Diffstat (limited to 'addons/website_forum')
| -rw-r--r-- | addons/website_forum/data/forum_data.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml index ba317fba4f7..e804525be18 100644 --- a/addons/website_forum/data/forum_data.xml +++ b/addons/website_forum/data/forum_data.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> - + <data noupdate="1"> <record id="forum_help" model="forum.forum"> <field name="name">Help</field> </record> @@ -12,7 +11,8 @@ <field name="parent_id" ref="website.main_menu"/> <field name="sequence" type="int">35</field> </record> - + </data> + <data> <function model="ir.config_parameter" name="set_param" eval="('auth_signup.allow_uninvited', True)" /> <!-- JUMP TO FORUM AT INSTALL --> @@ -21,10 +21,6 @@ <field name="target">self</field> <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))"/> </record> - <record id="base.open_menu" model="ir.actions.todo"> - <field name="action_id" ref="action_open_forum"/> - <field name="state">open</field> - </record> <!-- Set Admin karma --> <record id="base.user_root" model="res.users"> @@ -79,6 +75,11 @@ </data> <data noupdate="1"> + <record id="base.open_menu" model="ir.actions.todo"> + <field name="action_id" ref="action_open_forum"/> + <field name="state">open</field> + </record> + <!-- Reasons for closing Post --> <record id="reason_1" model="forum.post.reason"> <field name="name">duplicate post</field> |