[MERGE] mail groups improvements

    better form view
    security on groups: public, private, selected groups (for employees)
    menu automatically created/filtered
    action to open a specific group inline
    small fix in composition: new msg not linked to current user

bzr revid: fp@openerp.com-20120814112942-8wo9owa14hk5xqbj

2 files changed, 10 insertions, 52 deletions

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 8be63f22804..e3d7c2ab1e1 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -2,49 +2,22 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="message_blogpost0_attachment0" model="ir.attachment">
-            <field name="name">A cool attachment</field>
-            <field name="datas">PT1Tb21lIGNvb2wgYXR0YWNobWVudD09ClByYWVzZW50IHZlbCBtYXNzYSBzZWQgbWFzc2EgY29uc2VxdWF0IGVnZXN0YXMgaW4gdHJpc3RpcXVlIG9yY2ku</field>
-            <field name="datas_fname">a_cool_attachment</field>
-            <field name="description"></field>
-            <field name="res_name">Mail group</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
-            <field name="type">binary</field>
-        </record>
-
-        <record id="message_blogpost0_attachment1" model="ir.attachment">
-            <field name="name">Another clean attachment</field>
-            <field name="datas">PT1Tb21lIGNsZWFuIGF0dGFjaG1lbnQ9PQpOdWxsYSB0dXJwaXMgbGVvLCByaG9uY3VzIHV0IGVnZXN0YXMgc2l0IGFtZXQsIGNvbnNlY3RldHVyIHZpdGFlIHVybmEu</field>
-            <field name="datas_fname">a_clean_attachment</field>
-            <field name="description"></field>
-            <field name="res_name">Mail group</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
-            <field name="type">binary</field>
-        </record>
-
         <record id="message_blogpost0" model="mail.message">
             <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla.
-
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
-
-Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="body_html"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
+This month you also have 250 EUR of eco-checks for all employees that worked with us since 1 year minimum.]]></field>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="attachment_ids" eval="[(6,0,[ref('message_blogpost0_attachment0'),ref('message_blogpost0_attachment1')])]"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
+            <field name="body_html"><![CDATA[Great.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_root"/>
@@ -52,29 +25,17 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
 
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Agreed !
-Would it be possible to learn more about the author ?  (second comment)]]></field>
+            <field name="body_html"><![CDATA[Yes, that's a good news.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_demo"/>
         </record>
 
-        <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
-            <field name="name">Author's full biography</field>
-            <field name="datas">PT1BYm91dCB0aGUgYXV0aG9yPT0KSW50ZWdlciBzb2RhbGVzIGRvbG9yIGV1IGVsaXQgZnJpbmdpbGxhIGJsYW5kaXQu</field>
-            <field name="datas_fname">blogpost_author_biography</field>
-            <field name="description"></field>
-            <field name="res_name">Mail group</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
-            <field name="type">binary</field>
-        </record>
-
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
 
@@ -85,7 +46,6 @@ Check the file in attachment for more information !  (third comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="attachment_ids" eval="[(4,ref('message_blogpost0_comment2_attachment0'))]"/>
         </record>
 
         <record model="ir.config_parameter" id="user_mail_alias">
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 09a6ca29a2d..443b43b62d6 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -2,16 +2,14 @@
 <openerp>
     <data noupdate="1">
 
-        <record model="mail.group" id="group_all_company">
-            <field name="name">All Company</field>
-            <field name="description">All company users can come here and discuss.</field>
-        </record>
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>
+            <field name="description">Discussion about best sales practices and deals.</field>
         </record>
         <record model="mail.group" id="group_all_employees">
             <field name="name">All Employees</field>
             <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
+            <field name="description">Discussion about best sales practices and deals.</field>
         </record>
 
         <!-- notify all employees of module installation -->