[IMP] display the proper mail.group when clicking on the 'News' menu item

bzr revid: abo@openerp.com-20120627150052-bck3dd4o66s65po5

4 files changed, 11 insertions, 16 deletions

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 13dbe70a335..2cba3a1945a 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -9,9 +9,5 @@
             <field name="parent_menu_id" ref="portal_members_root_menu"/>
         </record>
 
-        <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 0acfb5d44c5..21641f45bc7 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -66,12 +66,15 @@ the portal's users.
             </field>
         </record>
 
+        <record id="company_news_feed" model="mail.group">
+            <field name="name">Company's news feed</field>
+        </record>
+
         <record id="action_news" model="ir.actions.act_window">
             <field name="name">News</field>
             <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"/>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="view_mode">form</field>
         </record>
 
 
@@ -87,13 +90,9 @@ the portal's users.
                 <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
                 <menuitem name="Our company" id="portal_company" 
                     parent="menu_portal" sequence="10"/>
-                    <!-- 
-                    right now it's not possible to directly call a client action 
-                    from a menuitem, so we can't use this shortcut element and 
-                    use an explicit record element instead
-                    -->
                     <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 054e37ab852..b1975a3c8b2 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -3,9 +3,9 @@ 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,mail.message,mail.model_mail_message,group_portal_member,1,0,1,1
 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_subscription,mail.subscription,mail.model_mail_subscription,group_portal_member,1,0,1,1
+access_mail_notification,mail.notification,mail.model_mail_notification,group_portal_member,1,0,1,0
 access_mail_group,mail.group,mail.model_mail_group,group_portal_member,1,0,0,0
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index bb183d72d2c..904326ea409 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -50,7 +50,7 @@
         </record>
 
         <!-- attach it to the portal menu -->
-        <menuitem name="Contact Us" id="portal_company_contact"
+        <menuitem name="Contact" id="portal_company_contact"
             parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
 
     </data>