diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-02-21 15:37:19 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-02-21 15:37:19 +0100 |
| commit | 1d2b6f1bef6af13245d29d56cbb5f9d61f9ca038 (patch) | |
| tree | 8ea1d203aef83d287de9ec578f81bd64eedb7359 /addons/note | |
| parent | f945b1bcc21621cfc056e40f4d66b7181d19239e (diff) | |
| parent | 84143a34b313c01b0b37b7d7246ce3d5c9476002 (diff) | |
[MERGE] forward port branch 12.0 up to 84143a34b31
Diffstat (limited to 'addons/note')
| -rw-r--r-- | addons/note/static/src/js/systray_activity_menu.js | 2 | ||||
| -rw-r--r-- | addons/note/static/tests/systray_activity_menu_tests.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/note/static/src/js/systray_activity_menu.js b/addons/note/static/src/js/systray_activity_menu.js index e2e484ca10f..f8a5e8e288e 100644 --- a/addons/note/static/src/js/systray_activity_menu.js +++ b/addons/note/static/src/js/systray_activity_menu.js @@ -118,7 +118,7 @@ ActivityMenu.include({ _onNoteDateTimeSetClick: function (ev) { ev.preventDefault(); ev.stopPropagation(); - this.noteDateTimeWidget.$input.click(); + this.noteDateTimeWidget.$input.select(); }, /** * Saving note (quick create) and updating activity preview diff --git a/addons/note/static/tests/systray_activity_menu_tests.js b/addons/note/static/tests/systray_activity_menu_tests.js index 8c4e2dde60a..151af26dfbc 100644 --- a/addons/note/static/tests/systray_activity_menu_tests.js +++ b/addons/note/static/tests/systray_activity_menu_tests.js @@ -108,7 +108,6 @@ QUnit.test('note activity menu widget: create note from activity menu', function // creating quick note with date testUtils.dom.click(activityMenu.$('.o_note_show')); activityMenu.$('input.o_note_input').val("New Note"); - testUtils.dom.click(activityMenu.$('.o_note_set_datetime')); testUtils.dom.click(activityMenu.$(".o_note_save")); assert.strictEqual(activityMenu.$('.o_notification_counter').text(), '2', "should increment activity notification counter after creating a second note"); |