From 4b1a8f71a401abadc62528abf1e66317b15ce671 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 27 Jun 2012 13:36:11 +0200
Subject: [PATCH] [ADD] ir.rules for mail models and a new action for the
 'News' menu

bzr revid: abo@openerp.com-20120627113611-wszls1sp0c54338z
---
 addons/portal/portal_view.xml              | 24 +++++++---------------
 addons/portal/security/ir.model.access.csv | 16 ++++++++++-----
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 7be3f05b0e7..0acfb5d44c5 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -66,16 +66,12 @@ the portal's users.
             </field>
         </record>
 
-        <record id="action_news" model="ir.actions.client">
+        <record id="action_news" model="ir.actions.act_window">
             <field name="name">News</field>
-            <field name="tag">mail.all_feeds</field>
-        </record>
-
-        <record id="action_about" model="ir.actions.act_window">
-            <field name="name">About</field>
-            <field name="res_model">res.company</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="base.view_company_form" />
+            <field name="res_model">mail.group</field>
+            <field name="res_id" eval="ref('portal.company_news_feed')"/>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="mail.view_group_form"/>
         </record>
 
 
@@ -96,14 +92,8 @@ the portal's users.
                     from a menuitem, so we can't use this shortcut element and 
                     use an explicit record element instead
                     -->
-                    <record id="portal_company_news" model="ir.ui.menu">
-                        <field name="name">News</field>
-                        <field name="action" ref="action_news"/>
-                        <field name="parent_id" ref="portal_company"/>
-                        <field name="sequence">10</field>
-                    </record>
-                    <menuitem name="About" id="portal_company_about" 
-                        parent="portal_company" action="action_about" sequence="50"/>
+                    <menuitem name="News" id="portal_company_news" 
+                        parent="portal_company" sequence="10" action="action_news"/>
                 <menuitem name="Orders" id="portal_orders" 
                     parent="menu_portal" sequence="20"/>
                 <menuitem name="Invoices and Payments" id="portal_invoices_payements" 
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index c132b0dfb68..054e37ab852 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,5 +1,11 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_all,access.portal.all,model_res_portal,,1,0,0,0
-access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
-access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
-access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_all,access.portal.all,model_res_portal,,1,0,0,0
+access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
+access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
+access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
+access_mail_message,mail.message,mail.model_mail_message,group_portal_member,1,0,0,0
+access_mail_message_all,mail.message.all,mail.model_mail_message,group_portal_member,1,0,0,0
+access_mail_thread,mail.thread,mail.model_mail_thread,group_portal_member,1,0,0,0
+access_mail_subscription,mail.subscription,mail.model_mail_subscription,group_portal_member,1,0,0,0
+access_mail_notification,mail.notification,mail.model_mail_notification,group_portal_member,1,0,0,0
+access_mail_group,mail.group,mail.model_mail_group,group_portal_member,1,0,0,0