diff options
| author | sri-odoo <sri@odoo.com> | 2018-09-14 11:42:07 +0200 |
|---|---|---|
| committer | XavierDo <xdo@odoo.com> | 2018-09-18 13:44:00 +0200 |
| commit | ed2773e381585ee3fd0c6b90e6f97f8f1237e6f4 (patch) | |
| tree | a536d6d14787abf00319c4c95ae8ad9cde917781 /addons/mail/static/tests/activity_tests.js | |
| parent | 47496b9fe5555ef23932fcfc3f2d6d6ee945daae (diff) | |
[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.
Diffstat (limited to 'addons/mail/static/tests/activity_tests.js')
| -rw-r--r-- | addons/mail/static/tests/activity_tests.js | 8 |
1 files changed, 4 insertions, 4 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'); |
