From 47b532638e82db78a7b9a4d4fb437a1fa29903e6 Mon Sep 17 00:00:00 2001
From: Rohan Patel <rop@odoo.com>
Date: Tue, 28 Feb 2017 11:55:28 +0100
Subject: [PATCH] [IMP] website_*: improve groups on website menu items

This commit adds required groups on website application menu items
like blog and slides. It also move Website Admin menu definition from
res config views to website views, because it is where it should
always have been defined.

This commit also update some sequences to reorder Apps.
---
 addons/website/views/res_config_views.xml     | 10 ----------
 addons/website/views/website_views.xml        | 19 +++++++++++++++++++
 .../website_blog/views/website_blog_views.xml |  6 +++++-
 addons/website_crm/__manifest__.py            |  1 +
 addons/website_event/__manifest__.py          |  2 +-
 addons/website_hr_recruitment/__manifest__.py |  1 +
 .../view/website_slides_backend.xml           |  6 +++++-
 7 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/addons/website/views/res_config_views.xml b/addons/website/views/res_config_views.xml
index 31d5f4e3ba7..5b05e220b1c 100644
--- a/addons/website/views/res_config_views.xml
+++ b/addons/website/views/res_config_views.xml
@@ -371,16 +371,6 @@ You can also edit the fields of the Extra Step page in eCommerce checkout.">
             <field name="target">inline</field>
         </record>
 
-        <record id="backend_dashboard" model="ir.actions.client">
-            <field name="name">Website Dashboard</field>
-            <field name="tag">backend_dashboard</field>
-        </record>
-
-        <menuitem id="menu_website_configuration" sequence="215" name="Website Admin"
-            groups="website.group_website_designer" web_icon="website,static/description/icon_admin.png"/>
-
-        <menuitem id="menu_dashboard" name="Dashboard" action="website.backend_dashboard" parent="website.menu_website_configuration" sequence="1"/>
-
         <menuitem id="menu_website_global_configuration" parent="menu_website_configuration"
             sequence="100" name="Configuration" groups="base.group_system"/>
         <menuitem id="menu_website_website_settings" parent="menu_website_global_configuration" name="Settings" action="action_website_configuration"/>
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index c52476cc4ef..9fbe8790a72 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
+        <!-- Menu items -->
+        <menuitem name="Website Admin"
+            id="menu_website_configuration"
+            sequence="9"
+            groups="website.group_website_publisher"
+            web_icon="website,static/description/icon_admin.png"/>
 
         <!-- website views -->
         <record id="view_website_form" model="ir.ui.view">
@@ -112,5 +118,18 @@
             </field>
         </record>
 
+        <!-- Dashboard -->
+        <record id="backend_dashboard" model="ir.actions.client">
+            <field name="name">Dashboard</field>
+            <field name="tag">backend_dashboard</field>
+        </record>
+
+        <menuitem id="menu_dashboard"
+            name="Dashboard"
+            sequence="1"
+            action="website.backend_dashboard"
+            groups="website.group_website_publisher"
+            parent="website.menu_website_configuration"/>
+
     </data>
 </odoo>
diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml
index c8192c33d44..46e80f1d0e1 100644
--- a/addons/website_blog/views/website_blog_views.xml
+++ b/addons/website_blog/views/website_blog_views.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <odoo>
-        <menuitem name="Blog" id="menu_website_blog_root" sequence="20" parent="website.menu_website_configuration"/>
+        <menuitem name="Blog"
+            id="menu_website_blog_root"
+            sequence="20"
+            parent="website.menu_website_configuration"
+            groups="website.group_website_designer"/>
 
         <!-- Blog views -->
         <record id="view_blog_blog_list" model="ir.ui.view">
diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py
index 53d16e58db9..2e16675dc95 100644
--- a/addons/website_crm/__manifest__.py
+++ b/addons/website_crm/__manifest__.py
@@ -1,6 +1,7 @@
 {
     'name': 'Contact Form',
     'category': 'Website',
+    'sequence': 54,
     'website': 'https://www.odoo.com/page/website-builder',
     'summary': 'Create Leads From Contact Form',
     'version': '2.0',
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index 6811d586e16..cd5d5ead131 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Online Events',
     'category': 'Marketing',
-    'sequence': 135,
+    'sequence': 166,
     'summary': 'Publish Events and Manage Online Registrations on your Website',
     'website': 'https://www.odoo.com/page/website-builder',
     'description': """
diff --git a/addons/website_hr_recruitment/__manifest__.py b/addons/website_hr_recruitment/__manifest__.py
index 0d3097d73b7..0e661b173e2 100644
--- a/addons/website_hr_recruitment/__manifest__.py
+++ b/addons/website_hr_recruitment/__manifest__.py
@@ -4,6 +4,7 @@
 {
     'name': 'Online Jobs',
     'category': 'Website',
+    'sequence': 142,
     'version': '1.0',
     'summary': 'Job Descriptions And Application Forms',
     'description': """
diff --git a/addons/website_slides/view/website_slides_backend.xml b/addons/website_slides/view/website_slides_backend.xml
index 85fdab556b0..1c0e5f75f36 100644
--- a/addons/website_slides/view/website_slides_backend.xml
+++ b/addons/website_slides/view/website_slides_backend.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <menuitem name="Slides" id="menu_website_slides_root" sequence="32" parent="website.menu_website_configuration"/>
+        <menuitem name="Slides"
+            id="menu_website_slides_root"
+            sequence="32"
+            parent="website.menu_website_configuration"
+            groups="website.group_website_designer"/>
 
         <!-- SLIDE.TAG -->
         <record id="view_slide_tag_form" model="ir.ui.view">