diff options
Diffstat (limited to 'addons/mail/mail_message_view.xml')
| -rw-r--r-- | addons/mail/mail_message_view.xml | 202 |
1 files changed, 16 insertions, 186 deletions
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 502a3e68e62..3e9f0d6a7ff 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -2,15 +2,15 @@ <openerp> <data> <!-- mail.message tree: short view !--> - <record model="ir.ui.view" id="view_message_tree_short"> - <field name="name">mail.message.tree.short</field> + <record model="ir.ui.view" id="view_message_tree"> + <field name="name">mail.message.tree</field> <field name="model">mail.message</field> <field name="priority">20</field> <field name="arch" type="xml"> <tree string="Messages"> <field name="date"/> <field name="subject"/> - <field name="user_id"/> + <field name="author_id"/> <field name="model"/> <field name="res_id"/> </tree> @@ -18,8 +18,8 @@ </record> <!-- mail.message form: short view !--> - <record model="ir.ui.view" id="view_message_form_short"> - <field name="name">mail.message.form.short</field> + <record model="ir.ui.view" id="view_message_form"> + <field name="name">mail.message.form</field> <field name="model">mail.message</field> <field name="priority">20</field> <field name="arch" type="xml"> @@ -28,10 +28,10 @@ <group> <group> <field name="subject"/> - <field name="user_id"/> + <field name="author_id"/> <field name="date"/> <field name="type"/> - <field name="content_subtype"/> + <field name="subtype_id"/> </group> <group> <field name="model"/> @@ -40,45 +40,22 @@ <field name="partner_ids" widget="many2many_tags"/> </group> </group> - <notebook> - <page string="Body (Rich)"> - <field name="body_html"/> - </page> - <page string="Body (Plain)"> - <field name="body_text" widget="text"/> - </page> - </notebook> + <field name="body"/> </sheet> </form> </field> </record> - <!-- mail.message search: short view !--> - <record model="ir.ui.view" id="view_message_search_short"> - <field name="name">mail.message.search.short</field> - <field name="model">mail.message</field> - <field name="priority">20</field> - <field name="arch" type="xml"> - <search string="Messages Search"> - <field name="model" string="Message"/> - <field name="date"/> - <field name="user_id"/> - </search> - </field> - </record> - <!-- mail.message search: wall view !--> - <record model="ir.ui.view" id="view_message_search_wall"> - <field name="name">mail.message.search.wall</field> + <record model="ir.ui.view" id="view_message_search"> + <field name="name">mail.message.search</field> <field name="model">mail.message</field> <field name="priority">25</field> <field name="arch" type="xml"> <search string="Messages Search"> <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" /> <field name="type"/> - <filter icon="terp-personal+" string="My Feeds" - name="my_feeds" help="My Feeds" - domain="[('user_id','=',uid)]"/> + <field name="author_id"/> <filter icon="terp-personal+" string="Comments" name="comments" help="Comments" domain="[('type', '=', 'comment')]"/> @@ -88,160 +65,16 @@ <filter icon="terp-personal+" string="Emails" name="emails" help="Emails" domain="[('type', '=', 'email')]"/> - <filter icon="terp-go-today" string="Today" - name="today" help="Today" - domain="[ ('date', '<=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')), - ('date', '>=', datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')) - ]"/> - <filter icon="terp-go-week" string="This week" - name="7_days" help="This week" - domain="[ ('date', '<=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')), - ('date', '>=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00')) - ]"/> - <field name="user_id"/> - </search> - </field> - </record> - - <record model="ir.ui.view" id="view_email_message_form"> - <field name="name">mail.message.form</field> - <field name="model">mail.message</field> - <field name="arch" type="xml"> - <form string="Email message" version="7.0"> - <sheet> - <label for="subject" class="oe_edit_only"/> - <h2><field name="subject"/></h2> - <div> - by <field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/> - <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied" - context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/> - </div> - <notebook colspan="4"> - <page string="Message Details"> - <group> - <group> - <field name="email_from"/> - <field name="email_to"/> - <field name="email_cc"/> - <field name="email_bcc"/> - <field name="reply_to"/> - </group> - <group> - <field name="partner_id" readonly="1"/> - <field name="partner_ids" widget="many2many_tags"/> - </group> - </group> - <notebook> - <page string="Body (Rich)"> - <field name="body_html"/> - </page> - <page string="Body (Plain)"> - <field name="body_text" widget="text"/> - </page> - </notebook> - </page> - <page string="Advanced" groups="base.group_no_one"> - <group> - <group> - <field name="auto_delete"/> - <field name="type"/> - <field name="subtype_id"/> - <field name="content_subtype"/> - <field name="state" colspan="2"/> - <field name="mail_server_id"/> - <field name="original"/> - <field name="model"/> - <field name="res_id"/> - <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2" - attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/> - </group> - <group> - <field name="message_id"/> - <field name="references"/> - <field name="headers"/> - </group> - </group> - </page> - <page string="Attachments"> - <field name="attachment_ids"/> - </page> - </notebook> - </sheet> - </form> - </field> - </record> - - <record model="ir.ui.view" id="view_email_message_tree"> - <field name="name">mail.message.tree</field> - <field name="model">mail.message</field> - <field name="arch" type="xml"> - <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'"> - <field name="date"/> - <field name="subject"/> - <field name="email_from"/> - <field name="user_id" string="User"/> - <field name="message_id" invisible="1"/> - <field name="partner_id" invisible="1"/> - <field name="model" invisible="1"/> - <field name="res_id" invisible="1"/> - <field name="state"/> - <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/> - <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/> - <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/> - <button name="open_document" string="Open Related Document" type="object" icon="gtk-jump-to"/> - <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/> - </tree> - </field> - </record> - - <record model="ir.ui.view" id="view_email_message_search"> - <field name="name">mail.message.search</field> - <field name="model">mail.message</field> - <field name="arch" type="xml"> - <search string="Email Search"> - <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/> - <field name="date"/> - <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/> - <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/> - <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/> - <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/> - <separator/> - <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/> - <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/> - <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/> - <group expand="0" string="Extended Filters..."> - <field name="user_id" string="User"/> - <field name="partner_id" string="Partner Name"/> - <field name="model"/> - <field name="res_id"/> - </group> - <group expand="0" string="Group By..."> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> - <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/> - <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> - </group> </search> </field> </record> - <record id="action_view_all_messages_short" model="ir.actions.act_window"> - <field name="name">Messages</field> - <field name="res_model">mail.message</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="context">{'tree_view_ref': 'mail.view_message_tree_short', 'form_view_ref': 'mail.view_message_form_short'}</field> - <field name="search_view_id" ref="view_message_search_short"/> - </record> - <record id="action_view_mail_message" model="ir.actions.act_window"> <field name="name">Messages</field> <field name="res_model">mail.message</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field> - <field name="search_view_id" ref="view_email_message_search"/> + <field name="search_view_id" ref="view_message_search"/> </record> <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]" @@ -249,24 +82,21 @@ id="act_res_partner_emails" name="Emails" res_model="mail.message" src_model="res.partner" - view_id="view_email_message_tree"/> - - <!-- Add menu entry in Settings/Email --> - <menuitem name="Messages" id="menu_email_message" parent="base.menu_email" action="action_view_mail_message" /> + view_id="view_message_tree"/> <!-- Add menu entry in Settings/Email --> - <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/> + <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/> <record id="action_mail_all_feeds" model="ir.actions.client"> <field name="name">News Feed</field> <field name="tag">mail.wall</field> - <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/> + <field name="params" eval=""{'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])] }""/> </record> <record id="action_mail_my_feeds" model="ir.actions.client"> <field name="name">My Feeds</field> <field name="tag">mail.wall</field> - <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'my_feeds': True}"/> + <field name="params" eval=""{'domain': [('author_id.user_ids', 'in', [uid])]}""/> </record> </data> </openerp> |