[FIX] mass_mailing, marketing: menus displayed to employees only (no portal/anonymous). ACL change too.

bzr revid: dle@openerp.com-20140113151018-5xksff08s0vrjh8d

4 files changed, 6 insertions, 8 deletions

diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 6467c516a49..88ef93916b6 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -5,7 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Marketing"
             id="base.marketing_menu"
-            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            groups="base.group_user"
             sequence="85"/>
 
          <record id="view_crm_lead_form" model="ir.ui.view">
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 0faba94379f..6503cc482ab 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -16,8 +16,6 @@
     </data>
     <data>
 
-    <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
-
     <!-- Marketing Campaign -->
     
     <record id="act_marketing_campaing_segment_opened" model="ir.actions.act_window">
@@ -177,7 +175,7 @@
         </field>
     </record>
 
-    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
+    <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu" groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30"/>
 
     <!-- Marketing Segments -->
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index c9594179a72..e8848fba44f 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -358,7 +358,7 @@
         </record>
 
         <!-- Top menu item -->
-        <menuitem name="Marketing" id="base.marketing_menu" sequence="85"/>
+        <menuitem name="Marketing" id="base.marketing_menu" sequence="85" groups="base.group_user"/>
 
         <!-- Add in marketing -->
         <menuitem name="Mass Mailing" id="mass_mailing_campaign"
diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv
index 6931ab0265b..59cf03c2c68 100644
--- a/addons/mass_mailing/security/ir.model.access.csv
+++ b/addons/mass_mailing/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_campaign,,1,1,1,0

+access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_campaign,base.group_user,1,1,1,0

 access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1

-access_mass_mailing,mail.mass_mailing,model_mail_mass_mailing,,1,1,1,0

+access_mass_mailing,mail.mass_mailing,model_mail_mass_mailing,base.group_user,1,1,1,0

 access_mass_mailing_system,mail.mass_mailing.system,model_mail_mass_mailing,base.group_system,1,1,1,1

-access_mail_mail_statistics,mail.mail.statistics,model_mail_mail_statistics,,1,1,1,1
\ No newline at end of file
+access_mail_mail_statistics,mail.mail.statistics,model_mail_mail_statistics,base.group_user,1,1,1,1
\ No newline at end of file