summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml/activity.xml
diff options
context:
space:
mode:
authorXavierDo <xdo@odoo.com>2018-08-14 13:31:45 +0200
committerRomainLibert <rli@odoo.com>2018-08-20 16:00:09 +0200
commit0be33db68a201ab71f5e1deaac31945b95649546 (patch)
treefbc08a20e7de11a6bd10f9f711c61d49168d4b44 /addons/mail/static/src/xml/activity.xml
parentc90ff2afd8b129eaa5bd451728d4c6c99a7db89d (diff)
[IMP] mail: refactor activity.js and add some test
activity.js was a little dirty with a lot of copy paste. Most of the common logic is now in a BasicModel. This commit also add some tests on activity view Co-authored-by: RomainLibert <rli@odoo.com>
Diffstat (limited to 'addons/mail/static/src/xml/activity.xml')
-rw-r--r--addons/mail/static/src/xml/activity.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index 86d527b01ed..2ddcea9121f 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -75,13 +75,13 @@
</div>
</t>
<div class="o_thread_message_tools btn-group">
- <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
+ <span class="o_mark_as_done" data-toggle="popover" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]"><a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_link mr8">
<i class="fa fa-check"/> Mark Done
- </a>
- <a role="button" href="#" class="btn btn-link btn-secondary text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
+ </a></span>
+ <a role="button" href="#" class="btn btn-link btn-secondary text-muted o_edit_activity o_activity_link" t-att-data-activity-id="activity.id">
<i class="fa fa-pencil"/> Edit
</a>
- <a role="button" href="#" class="btn btn-link btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
+ <a role="button" href="#" class="btn btn-link btn-danger text-muted o_unlink_activity o_activity_link" t-att-data-activity-id="activity.id">
<i class="fa fa-times"/> Cancel
</a>
</div>