diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-12-02 13:31:28 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-12-02 15:18:45 +0000 |
| commit | dc89f58467aad18fa7f0b9905c543dd71bda66ea (patch) | |
| tree | 71ecf2aa7f452fa5e86a8b8d7fc9482879a39eb4 /addons | |
| parent | 7fae045d48fb417035971d087b9594c4f886f27a (diff) | |
[IMP] mail, rating, portal_rating: improve message and rating views
Purpose of this commit is to add some missing fields in message view, notably
is_internal newly added flag and its ratings. Rating form view is also
updated to display is_internal flag, and form view is a bit reorganized.
Task ID 2071556
PR #38692
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/views/mail_blacklist_views.xml | 2 | ||||
| -rw-r--r-- | addons/mail/views/mail_followers_views.xml | 2 | ||||
| -rw-r--r-- | addons/mail/views/mail_message_views.xml | 17 | ||||
| -rw-r--r-- | addons/mail/views/mail_notification_views.xml | 2 | ||||
| -rw-r--r-- | addons/portal_rating/views/rating_views.xml | 2 | ||||
| -rw-r--r-- | addons/rating/__manifest__.py | 5 | ||||
| -rw-r--r-- | addons/rating/views/mail_message_views.xml | 15 | ||||
| -rw-r--r-- | addons/rating/views/rating_rating_views.xml (renamed from addons/rating/views/rating_view.xml) | 26 |
8 files changed, 50 insertions, 21 deletions
diff --git a/addons/mail/views/mail_blacklist_views.xml b/addons/mail/views/mail_blacklist_views.xml index 05c59ede18b..139344a38a2 100644 --- a/addons/mail/views/mail_blacklist_views.xml +++ b/addons/mail/views/mail_blacklist_views.xml @@ -62,6 +62,6 @@ name="Email Blacklist" action="mail_blacklist_action" parent="mail.mail_menu_technical" - sequence="20"/> + sequence="22"/> </odoo> diff --git a/addons/mail/views/mail_followers_views.xml b/addons/mail/views/mail_followers_views.xml index d3d743482c7..bb098690b57 100644 --- a/addons/mail/views/mail_followers_views.xml +++ b/addons/mail/views/mail_followers_views.xml @@ -50,7 +50,7 @@ id="menu_email_followers" parent="mail.mail_menu_technical" action="action_view_followers" - sequence="20" + sequence="21" groups="base.group_no_one"/> </data> diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml index c9217f94db2..01015d7aea0 100644 --- a/addons/mail/views/mail_message_views.xml +++ b/addons/mail/views/mail_message_views.xml @@ -18,8 +18,8 @@ </record> <!-- mail.message form: short view !--> - <record model="ir.ui.view" id="view_message_form"> - <field name="name">mail.message.form</field> + <record id="mail_message_view_form" model="ir.ui.view"> + <field name="name">mail.message.view.form</field> <field name="model">mail.message</field> <field name="priority">20</field> <field name="arch" type="xml"> @@ -31,16 +31,17 @@ <field name="date"/> <field name="email_from"/> <field name="author_id"/> - <field name="record_name"/> - <field name="moderator_id"/> + <field name="message_type"/> + <field name="subtype_id"/> + <field name="is_internal"/> </group> <group> - <field name="parent_id"/> <field name="model"/> <field name="res_id" widget="integer"/> - <field name="message_type"/> - <field name="subtype_id"/> + <field name="record_name"/> + <field name="parent_id"/> <field name="moderation_status"/> + <field name="moderator_id"/> </group> </group> <notebook> @@ -81,7 +82,7 @@ </field> </group> </page> - <page string="Tracking"> + <page string="Tracking" name="page_tracking"> <field name="tracking_value_ids"/> </page> </notebook> diff --git a/addons/mail/views/mail_notification_views.xml b/addons/mail/views/mail_notification_views.xml index 8ebbbb18c53..3167fb4cda4 100644 --- a/addons/mail/views/mail_notification_views.xml +++ b/addons/mail/views/mail_notification_views.xml @@ -52,7 +52,7 @@ id="mail_notification_menu" parent="mail.mail_menu_technical" action="mail_notification_action" - sequence="30" + sequence="20" groups="base.group_no_one"/> </data></odoo> diff --git a/addons/portal_rating/views/rating_views.xml b/addons/portal_rating/views/rating_views.xml index 2a9e5bf0866..c179d92e1fd 100644 --- a/addons/portal_rating/views/rating_views.xml +++ b/addons/portal_rating/views/rating_views.xml @@ -5,7 +5,7 @@ <field name="model">rating.rating</field> <field name="inherit_id" ref="rating.rating_rating_view_form"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='feedback']" position="after"> + <xpath expr="//field[@name='is_internal']" position="after"> <field name="publisher_comment" string="Publisher comment"/> </xpath> </field> diff --git a/addons/rating/__manifest__.py b/addons/rating/__manifest__.py index db4e37c8609..6f05e8fd972 100644 --- a/addons/rating/__manifest__.py +++ b/addons/rating/__manifest__.py @@ -10,11 +10,12 @@ This module allows a customer to give rating. 'mail', ], 'data': [ - 'views/rating_view.xml', + 'views/rating_rating_views.xml', 'views/rating_template.xml', + 'views/mail_message_views.xml', 'views/assets.xml', 'security/ir.model.access.csv' - ], + ], 'installable': True, 'auto_install': False, } diff --git a/addons/rating/views/mail_message_views.xml b/addons/rating/views/mail_message_views.xml new file mode 100644 index 00000000000..887c7684526 --- /dev/null +++ b/addons/rating/views/mail_message_views.xml @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<odoo><data> + <record id="mail_message_view_form" model="ir.ui.view"> + <field name="name">mail.message.view.form.inherit.rating</field> + <field name="model">mail.message</field> + <field name="inherit_id" ref="mail.mail_message_view_form"/> + <field name="arch" type="xml"> + <xpath expr="//page[@name='page_tracking']" position="after"> + <page string="Ratings" name="page_rating"> + <field name="rating_ids"/> + </page> + </xpath> + </field> + </record> +</data></odoo> diff --git a/addons/rating/views/rating_view.xml b/addons/rating/views/rating_rating_views.xml index 7370d05c875..22f46276795 100644 --- a/addons/rating/views/rating_view.xml +++ b/addons/rating/views/rating_rating_views.xml @@ -32,22 +32,21 @@ </div> <group> <group> - <field name="res_name"/> - <field name="parent_res_name"/> + <field name="res_name" string="Document"/> + <field name="parent_res_name" string="Parent Holder"/> <field name="rated_partner_id"/> - <field name="partner_id"/> <field name="rating" invisible="1"/> - <field name="create_date" string="Submitted on"/> + <field name="is_internal"/> </group> <group> - <div colspan="2" class="text-center"> + <field name="partner_id"/> + <div colspan="2" class="text-center" name="rating_image_container"> <field name="rating_image" widget='image'/> <div class="mt4"> <strong><field name="rating_text"/></strong> </div> </div> - </group> - <group> + <field name="create_date" string="Submitted on"/> <field name="feedback" attrs="{'invisible': [('feedback','=',False)]}"/> </group> </group> @@ -169,4 +168,17 @@ </field> </record> + <record id="rating_rating_view" model="ir.actions.act_window"> + <field name="name">Ratings</field> + <field name="res_model">rating.rating</field> + <field name="view_mode">kanban,tree,graph,pivot,form</field> + </record> + + <!-- Add menu entry in Technical/Discuss --> + <menuitem name="Ratings" + id="rating_rating_menu_technical" + parent="mail.mail_menu_technical" + action="rating_rating_view" + sequence="30"/> + </odoo> |
