pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] chatter: improve chatter readability

Browse Source 
Only messages as comments and email template should keep a white backround since they are not internal.

It is also enough to display fields that changed on subtypes (update message) since emails will be reworked soon and more information will be given there. The support of 'always' track can be removed. (is now considered as a simple tracked field)

The use of self.env.ref('mail.mt_comment').id add some query and the performance tests needs to be update since message_format is called by notify_by_chat. This code will be refactor later
This commit is contained in:
Xavier-Do
2018-01-30 14:49:03 +01:00
committed by XavierDo
parent ba5133dc63
commit c99de45515
10 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/im_livechat/static/src/js/im_livechat.js
+1
View File
@@ -228,6 +228,7 @@ var LivechatButton = Widget.extend({
date: moment(time.str_to_datetime(data.date)),
is_needaction: false,
is_note: data.is_note,
is_discussion: data.is_discussion,
customer_email_data: []
};
addons/mail/models/mail_message.py
+5 -2
View File
@@ -404,6 +404,7 @@ class Message(models.Model):
'id': 59,
'subject': False
'is_note': True # only if the subtype is internal
'is_discussion': False # only if the message is a discussion (subtype == discussion)
}
"""
message_values = self.read([
@@ -417,13 +418,15 @@ class Message(models.Model):
message_tree = dict((m.id, m) for m in self.sudo())
self._message_read_dict_postprocess(message_values, message_tree)
# add subtype data (is_note flag, subtype_description). Do it as sudo
# add subtype data (is_note flag, is_discussion flag , subtype_description). Do it as sudo
# because portal / public may have to look for internal subtypes
subtype_ids = [msg['subtype_id'][0] for msg in message_values if msg['subtype_id']]
subtypes = self.env['mail.message.subtype'].sudo().browse(subtype_ids).read(['internal', 'description'])
subtypes = self.env['mail.message.subtype'].sudo().browse(subtype_ids).read(['internal', 'description','id'])
subtypes_dict = dict((subtype['id'], subtype) for subtype in subtypes)
xml_comment_id = self.env.ref('mail.mt_comment').id
for message in message_values:
message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['internal']
message['is_discussion'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['id'] == xml_comment_id
message['subtype_description'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['description']
if message['model'] and self.env[message['model']]._original_module:
message['module_icon'] = modules.module.get_module_icon(self.env[message['model']]._original_module)
addons/mail/models/mail_thread.py
+2 -15
View File
@@ -461,8 +461,7 @@ class MailThread(models.AbstractModel):
def _get_tracked_fields(self, updated_fields):
""" Return a structure of tracked fields for the current model.
:param list updated_fields: modified field names
:return dict: a dict mapping field name to description, containing
always tracked fields and modified on_change fields
:return dict: a dict mapping field name to description, containing on_change fields
"""
tracked_fields = []
for name, field in self._fields.items():
@@ -521,14 +520,11 @@ class MailThread(models.AbstractModel):
- a set of updated column names
- a list of changes (initial value, new value, column name, column info) """
self.ensure_one()
changes = set() # contains always and onchange tracked fields that changed
displays = set() # contains always tracked field that did not change but displayed for information
changes = set() # contains onchange tracked fields that changed
tracking_value_ids = []
display_values_ids = []
# generate tracked_values data structure: {'col_name': {col_info, new_value, old_value}}
for col_name, col_info in tracked_fields.items():
track_visibility = getattr(self._fields[col_name], 'track_visibility', 'onchange')
initial_value = initial[col_name]
new_value = getattr(self, col_name)
@@ -539,15 +535,6 @@ class MailThread(models.AbstractModel):
if col_name in tracked_fields:
changes.add(col_name)
# 'always' tracked fields in separate variable; added if other changes
elif new_value == initial_value and track_visibility == 'always' and col_name in tracked_fields:
tracking = self.env['mail.tracking.value'].create_tracking_values(initial_value, initial_value, col_name, col_info)
if tracking:
display_values_ids.append([0, 0, tracking])
displays.add(col_name)
if changes and displays:
tracking_value_ids = display_values_ids + tracking_value_ids
return changes, tracking_value_ids
addons/mail/static/src/js/chat_manager.js
+1
View File
@@ -130,6 +130,7 @@ function make_message (data) {
subtype_description: data.subtype_description,
is_author: data.author_id && data.author_id[0] === session.partner_id,
is_note: data.is_note,
is_discussion: data.is_discussion,
is_system_notification: (data.message_type === 'notification' && data.model === 'mail.channel')
|| data.info === 'transient_message',
attachment_ids: data.attachment_ids || [],
addons/mail/static/src/less/thread.less
+6 -5
View File
@@ -47,6 +47,11 @@
padding: 4px @odoo-horizontal-padding;
margin-bottom: 0px;
&.o_mail_not_discussion {
background-color: @mail-thread-note;
border-bottom: 1px solid @gray-lighter-dark;
}
.o_thread_message_sidebar {
.o-flex(0, 0, @mail-thread-avatar-size);
margin-right: 10px;
@@ -109,11 +114,7 @@
text-align: justify;
}
&.o_mail_note {
background-color: @mail-thread-note;
padding-left: @grid-gutter-width*0.3;
border-bottom: 1px solid @gray-lighter-dark;
}
.o_mail_subject {
font-style: italic;
addons/mail/static/src/xml/thread.xml
+1 -1
View File
@@ -139,7 +139,7 @@
</t>
<t t-name="mail.ChatThread.Message">
<div t-att-class="'o_thread_message' + (message.expanded ? ' o_message_expanded ' : ' ') + (message.is_selected ? 'o_thread_selected_message' : '')" t-att-data-message-id="message.id">
<div t-att-class="'o_thread_message' + (message.expanded ? ' o_message_expanded ' : ' ') + (message.is_selected ? 'o_thread_selected_message' : '') + (message.is_discussion ? ' o_mail_discussion' : ' o_mail_not_discussion')" t-att-data-message-id="message.id">
<div t-if="options.display_avatar" class="o_thread_message_sidebar">
<t t-if="!message.mailto and message.author_id[0]">
<img t-if="message.avatar_src and message.display_author"
addons/mail/static/tests/chat_window_test.js
+1
View File
@@ -27,6 +27,7 @@ QUnit.module('mail', {}, function () {
displayed_author: "John Doe",
id: 1,
is_note: false,
is_discussion: true,
is_starred: false,
model: 'partner',
res_id: 2
addons/mail/static/tests/chatter_tests.js
+5
View File
@@ -418,6 +418,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
displayed_author: "John Doe",
id: 1,
is_note: false,
is_discussion: true,
is_starred: false,
model: 'partner',
res_id: 2,
@@ -467,6 +468,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
displayed_author: "Me",
id: msg_id,
is_note: event.data.message.subtype === 'mail.mt_note',
is_discussion: event.data.message.subtype === 'mail.mt_comment',
is_starred: false,
model: 'partner',
res_id: 2,
@@ -615,6 +617,7 @@ QUnit.test('chatter: post a message and switch in edit mode', function (assert)
displayed_author: "Me",
id: 42,
is_note: event.data.message.subtype === 'mail.mt_note',
is_discussion: event.data.message.subtype === 'mail.mt_comment',
is_starred: false,
model: 'partner',
res_id: 2,
@@ -686,6 +689,7 @@ QUnit.test('chatter: Attachment viewer', function (assert) {
displayed_author: "John Doe",
id: 1,
is_note: false,
is_discussion: true,
is_starred: false,
model: 'partner',
res_id: 2,
@@ -934,6 +938,7 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
displayed_author: "John Doe",
id: 1,
is_note: true,
is_discussion: false,
});
route = '/web/dataset/call_kw/mail.activity/unlink';
args.method = 'unlink';
addons/test_mail/tests/test_message_track.py
+5 -7
View File
@@ -40,7 +40,7 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails):
self.assertEqual(self.record.message_ids, self.env['mail.message'])
def test_message_track_no_subtype(self):
""" Update some tracked fields not linked to some subtype -> message with onchange + always tracked values """
""" Update some tracked fields not linked to some subtype -> message with onchange """
customer = self.env['res.partner'].create({'name': 'Customer', 'email': 'cust@example.com'})
self.record.write({
'name': 'Test2',
@@ -59,12 +59,11 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails):
# verify tracked value
self.assertTracking(
self.record.message_ids,
[('email_from', 'char', False, False), # always tracked field
('customer_id', 'many2one', False, customer) # onchange tracked field
[('customer_id', 'many2one', False, customer) # onchange tracked field
])
def test_message_track_subtype(self):
""" Update some tracked fields linked to some subtype -> message with onchange + always tracked values """
""" Update some tracked fields linked to some subtype -> message with onchange """
self.record.message_subscribe(
partner_ids=[self.user_admin.partner_id.id],
subtype_ids=[self.env.ref('test_mail.st_mail_test_full_umbrella_upd').id]
@@ -87,12 +86,11 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails):
# verify tracked value
self.assertTracking(
self.record.message_ids,
[('email_from', 'char', False, 'noone@example.com'), # always tracked field
('umbrella_id', 'many2one', False, umbrella) # onchange tracked field
[('umbrella_id', 'many2one', False, umbrella) # onchange tracked field
])
def test_message_track_template(self):
""" Update some tracked fields linked to some template -> message with onchange + always tracked values """
""" Update some tracked fields linked to some template -> message with onchange """
self.record.write({'mail_template': self.env.ref('test_mail.mail_test_full_tracking_tpl').id})
self.assertEqual(self.record.message_ids, self.env['mail.message'])
addons/test_mail/tests/test_performance.py
+7 -7
View File
@@ -77,7 +77,7 @@ class TestMailPerformance(TransactionCase):
'partner_id': self.env.ref('base.res_partner_12').id,
})
with self.assertQueryCount(admin=32, demo=44): # test_mail only: 30 - 41
with self.assertQueryCount(admin=33, demo=45): # test_mail only: 30 - 41
record.track = 'X'
@users('admin', 'demo')
@@ -93,13 +93,13 @@ class TestMailPerformance(TransactionCase):
@warmup
def test_create_mail_with_tracking(self):
""" Create records inheriting from 'mail.thread' (with field tracking). """
with self.assertQueryCount(admin=62, demo=84): # test_mail only: 58 - 78
with self.assertQueryCount(admin=64, demo=86): # test_mail only: 58 - 78
self.env['test_performance.mail'].create({'name': 'X'})
@users('admin', 'emp')
@warmup
def test_create_mail_simple(self):
with self.assertQueryCount(admin=32, emp=42): # test_mail only: 30 - 39
with self.assertQueryCount(admin=33, emp=43): # test_mail only: 30 - 39
self.env['mail.test.simple'].create({'name': 'Test'})
@users('admin', 'emp')
@@ -137,7 +137,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_adv_activity(self):
model = self.env['mail.test.activity']
with self.assertQueryCount(admin=35, emp=45): # test_mail only: 33 - 42
with self.assertQueryCount(admin=36, emp=46): # test_mail only: 33 - 42
model.create({'name': 'Test'})
@users('admin', 'emp')
@@ -149,7 +149,7 @@ class TestAdvMailPerformance(TransactionCase):
'default_res_model': 'mail.test.activity',
})
with self.assertQueryCount(admin=47, emp=52): # com runbot 46 - 51 // test_mail only: 35 - 40
with self.assertQueryCount(admin=47, emp=53): # com runbot 46 - 51 // test_mail only: 35 - 40
model.create({
'summary': 'Test Activity',
'res_id': record.id,
@@ -276,7 +276,7 @@ class TestHeavyMailPerformance(TransactionCase):
customer_id = self.customer.id
user_id = self.user_portal.id
with self.assertQueryCount(admin=347, emp=420): # test_mail only: 330 - 399
with self.assertQueryCount(admin=348, emp=421): # test_mail only: 330 - 399
rec = self.env['mail.test.full'].create({
'name': 'Test',
'umbrella_id': umbrella_id,
@@ -315,7 +315,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
with self.assertQueryCount(admin=238, emp=278): # test_mail only: 232 - 271
with self.assertQueryCount(admin=239, emp=279): # test_mail only: 232 - 271
rec.write({
'name': 'Test2',
'umbrella_id': umbrella_id,