diff options
| author | Mahendra barad <mba@openerp.com> | 2017-03-02 12:11:49 +0530 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2017-03-03 11:40:50 +0100 |
| commit | 26940f8de4e8c2b8fb71d22fd53f2c537028ac1a (patch) | |
| tree | 2ad1be979ef2e8c732769f276272a96b2e35b27f /addons/mail/static/src/xml/activity.xml | |
| parent | 09de7be22c63e88c44d4aa617318ad6ac9d27282 (diff) | |
[IMP] mail: remove duplicated logs when scheduling activities and improve template
Currently when scheduling activities, duplicate logs are created. Indeed
a message is posted when scheduling an activity, editing it and marking it
as done. This leads to a lot of noise being created on records.
This commit remove logs when scheduling and updating an activity. A sole
message is posted when the activity is marked as done.
Scheduled activity display in chatter is also improved to better
differentiate the user creating the activity from the user who is
assigned to the activity.
Diffstat (limited to 'addons/mail/static/src/xml/activity.xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 0f699b6c2d1..92f15abcc9a 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -16,16 +16,23 @@ <strong> <span t-attf-class="fa #{activity.icon}" /> <t t-esc="activity.activity_type_id[1]" /> - </strong> planned by <strong><t t-esc="activity.user_id[1]" /></strong> + </strong> <span class="fa fa-clock-o ml8" /> - <span t-attf-class="o_activity_date o_activity_color_#{activity.state}"><t t-esc="activity.label_delay" /></span> + <strong> + <span t-attf-class="o_activity_date o_activity_color_#{activity.state}"><t t-esc="activity.label_delay" /> (<t t-esc="activity.date_deadline"/>) </span> + </strong> + planned by <t t-esc="activity.create_uid[1]" /> + <t t-if="activity.create_uid[0] != activity.user_id[0]"> + for <t t-esc="activity.user_id[1]" /> + </t> + - <t t-esc="activity.time_ago"/> <div class="pull-right"> <a href="#" class="o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">Edit</a> | <a href="#" class="o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">Remove</a> </div> </div> <div t-if="activity.summary"> - <strong><i><t t-esc="activity.summary"/></i></strong> + <strong><t t-esc="activity.summary"/></strong> </div> <div t-if="activity.note"> <t t-raw="activity.note"/> |