odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] mail.thread menus reordering and cleaning 

bzr revid: tde@openerp.com-20120309101412-pbrqosltp4i4xlt2
This commit is contained in:
Thibault Delavallée 2012-03-09 11:14:12 +01:00
parent fd27e7f87e
commit 7e427cce8c
3 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_group_view.xml
View File

@ -111,7 +111,7 @@
</record>
<!-- left-side menu: Groups !-->
<menuitem id="mail_groups" name="Groups" parent="mail_feeds_main"/>
<menuitem id="mail_groups" name="Groups" sequence="15" parent="mail_feeds_main"/>
<menuitem id="mail_allgroups" name="All groups" parent="mail_groups" action="action_view_groups"/>
</data>
</openerp>

67
addons/mail/mail_message_view.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- mail.message tree: tweet-type view !-->
<record model="ir.ui.view" id="view_tweet_tree">
<field name="name">mail.message.tree_tweet</field>
<!-- mail.message tree: short view !-->
<record model="ir.ui.view" id="view_message_tree_short">
<field name="name">mail.message.tree.short</field>
<field name="model">mail.message</field>
<field name="type">tree</field>
<field name="sequence">15</field>
<field name="arch" type="xml">
<tree string="Tweets">
<tree string="Messages">
<field name="date"/>
<field name="subject"/>
<field name="user_id"/>
@ -18,14 +18,14 @@
</field>
</record>
<!-- mail.message form: tweet-type view !-->
<record model="ir.ui.view" id="view_tweet_form">
<field name="name">mail.message.form_tweet</field>
<!-- mail.message form: short view !-->
<record model="ir.ui.view" id="view_message_form_short">
<field name="name">mail.message.form.short</field>
<field name="model">mail.message</field>
<field name="type">form</field>
<field name="sequence">15</field>
<field name="arch" type="xml">
<form string="Tweet">
<form string="Message">
<group colspan="2" col="2">
<field name="subject"/>
<field name="date"/>
@ -43,13 +43,13 @@
</field>
</record>
<!-- mail.message search: tweet-type view !-->
<record model="ir.ui.view" id="view_tweet_search">
<field name="name">mail.message.search_tweet</field>
<!-- 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="type">search</field>
<field name="arch" type="xml">
<search string="Tweet Search">
<search string="Messages Search">
<field name="user_id"/>
<field name="model"/>
<field name="date"/>
@ -180,12 +180,15 @@
</field>
</record>
<record id="action_view_all_message" model="ir.actions.act_window">
<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="search_view_id" ref="view_email_message_search"/>
<!--
<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">
@ -193,29 +196,12 @@
<field name="res_model">mail.message</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">['|',('state','in',['outgoing','exception']),('email_from', '!=', False)]</field>
<!--
<field name="domain">['&', ('type', '=', 'email'), '|',('state','in',['outgoing','exception']),('email_from', '!=', False)]</field>
-->
<field name="search_view_id" ref="view_email_message_search"/>
</record>
<record id="action_view_tweets" 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">{'filter_search': True, 'tree_view_ref': 'mail.view_tweet_tree', 'form_view_ref': 'mail.view_tweet_form'}</field>
<field name="search_view_id" ref="view_tweet_search"/>
</record>
<record id="action_view_mytweets" 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">{'filter_search': True, 'tree_view_ref': 'mail.view_tweet_tree', 'form_view_ref': 'mail.view_tweet_form'}</field>
<field name="search_view_id" ref="view_tweet_search"/>
<field name="domain">[('user_id', '=', uid)]</field>
</record>
<act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
context="{'default_partner_id': active_id}"
id="act_res_partner_emails" name="Emails"
@ -229,16 +215,15 @@
action="action_view_mail_message" />
<record id="action_mail_all_feeds" model="ir.actions.client">
<field name="name">(w)All Feeds</field>
<field name="tag">mail.all_feeds</field>
<field name="params" eval="{'search_view_id': ref('view_tweet_search')}"/>
<field name="name">(w)All Feeds</field>
<field name="tag">mail.all_feeds</field>
<field name="params" eval="{'search_view_id': ref('view_message_search_short')}"/>
</record>
<record id="action_mail_my_feeds" model="ir.actions.client">
<field name="name">My Feeds</field>
<field name="tag">mail.all_feeds</field>
<field name="params" eval="{'search_view_id': ref('view_tweet_search')}"/>
<field name="name">My Feeds</field>
<field name="tag">mail.all_feeds</field>
<field name="params" eval="{'search_view_id': ref('view_message_search_short')}"/>
</record>
</data>
</openerp>

8
addons/mail/mail_thread_view.xml
View File

@ -9,7 +9,7 @@
</record>
<!-- left-side menu: Feeds !-->
<menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
<menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
<record id="mail_myfeeds" model="ir.ui.menu">
<field name="name">My Feeds</field>
<field name="sequence" eval="10"/>
@ -23,10 +23,8 @@
<field name="parent_id" ref="mail_feeds"/>
</record>
<!-- left-side menu: Tmp !-->
<menuitem id="mail_debug" name="Debug/Tmp" parent="mail_feeds_main"/>
<menuitem id="mail_debug_msgs" name="Messages" parent="mail_debug" action="action_view_all_message"/>
<menuitem id="mail_debug_myfeeds" name="My feeds" parent="mail_debug" action="action_view_mytweets"/>
<menuitem id="mail_debug_allfeeds" name="All feeds" parent="mail_debug" action="action_view_tweets"/>
<menuitem id="mail_debug" name="Debug/Tmp" sequence="20" parent="mail_feeds_main"/>
<menuitem id="mail_debug_msgs" name="Messages" parent="mail_debug" action="action_view_all_messages_short"/>
<menuitem id="mail_debug_subs" name="Subscriptions" parent="mail_debug" action="action_view_subscriptions"/>
<menuitem id="mail_debug_notifs" name="Pushed notif" parent="mail_debug" action="action_view_notifications"/>