[REF] mail: activities list, ‘mark as done’ sliding panel

Refactor ‘mark as done’ popup JS in order to use a sliding panel layout instead.
Sliding panels are currently needed in kanban views, where activities are listed in a dropdown that can't handle popups because of CSS overflow and lack of space.

Since this new system check for default bootstrap data-toggle attributes, it could be easily used elsewhere changing the buttons's data-toggle and providing the necessary container for the “mark as done” form.

2 files changed, 8 insertions, 7 deletions

diff --git a/addons/mail/static/tests/activity_tests.js b/addons/mail/static/tests/activity_tests.js
index 8dfa518da5f..9f7f7fd8808 100644
--- a/addons/mail/static/tests/activity_tests.js
+++ b/addons/mail/static/tests/activity_tests.js
@@ -308,13 +308,13 @@ QUnit.test('activity view: activity widget', function (assert) {
     today.find('.o_closest_deadline').click();
     assert.ok(dropdown.hasClass('show'), "dropdown should be displayed");
     assert.ok(dropdown.find('.o_activity_color_today:contains(Today)').length, "Title should be today");
-    assert.ok(dropdown.find('.o_activity_title div div div:first span:contains(template8)').length,
+    assert.ok(dropdown.find('.o_activity_title_entry[data-activity-id="2"]:first div:contains(template8)').length,
         "template8 should be available");
-    assert.ok(dropdown.find('.o_activity_title div div div:nth-child(2) span:contains(template9)').length,
+    assert.ok(dropdown.find('.o_activity_title_entry[data-activity-id="2"]:eq(1) div:contains(template9)').length,
         "template9 should be available");
 
-    dropdown.find('.o_activity_title div div div:first .o_activity_template_preview').click();
-    dropdown.find('.o_activity_title div div div:first .o_activity_template_send').click();
+    dropdown.find('.o_activity_title_entry[data-activity-id="2"]:first .o_activity_template_preview').click();
+    dropdown.find('.o_activity_title_entry[data-activity-id="2"]:first .o_activity_template_send').click();
     var overdue = activity.$('table tbody tr:first td:nth-child(3).overdue');
     overdue.find('.o_closest_deadline').click();
     dropdown = overdue.find('.dropdown-menu.o_activity');
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index 00705b0c26e..b69bc6825e5 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -492,7 +492,7 @@ QUnit.test('kanban activity widget with no activity', function (assert) {
 });
 
 QUnit.test('kanban activity widget with an activity', function (assert) {
-    assert.expect(11);
+    assert.expect(12);
 
     this.data.partner.records[0].activity_ids = [1];
     this.data.partner.records[0].activity_state = 'today';
@@ -539,8 +539,9 @@ QUnit.test('kanban activity widget with an activity', function (assert) {
     $record.find('.o_activity_btn').click();
     assert.strictEqual(rpcCount, 2, 'a read should have been done to fetch the activity details');
     assert.strictEqual($record.find('.o_activity_title').length, 1, "should have an activity scheduled");
-    var label_text = $record.find('.o_activity_label .o_activity_color_today').text();
-    assert.ok(label_text.indexOf('Today (1)') >= 0, "should display the correct label and count");
+    var label = $record.find('.o_activity_log .o_activity_color_today');
+    assert.strictEqual(label.find('strong').text(), "Today", "should display the correct label");
+    assert.strictEqual(label.find('.badge-warning').text(), "1", "should display the correct count");
 
     // click on the activity button to close the dropdown
     $record.find('.o_activity_btn').click();