diff options
| author | bit-odoo <bit@odoo.com> | 2021-02-15 07:13:05 +0000 |
|---|---|---|
| committer | bit-odoo <bit@odoo.com> | 2021-02-15 09:45:55 +0000 |
| commit | 24804aaef12fd98bc63fdb0e7905500ac76f877a (patch) | |
| tree | 1705929f6243664934e27c92f95aff67b9665b32 | |
| parent | c8b3dc91dc394ddec2e7e56b2959db026384a3fc (diff) | |
[FIX] mail: missing discard button if next activity flow
Before this commit:
If a next activity is "triggered", the discard button is not visible.
After this commit:
Even if a next activity is "triggered", the discard button will visible.
Task-2459645
closes odoo/odoo#66164
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml index 1e6f8d4b0bb..357ab59baeb 100644 --- a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml +++ b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml @@ -11,10 +11,10 @@ <button type="button" class="o_ActivityMarkDonePopover_doneButton btn btn-sm btn-primary" t-on-click="_onClickDone"> Done </button> - <button type="button" class="o_ActivityMarkDonePopover_discardButton btn btn-sm btn-link" t-on-click="_onClickDiscard"> - Discard - </button> </t> + <button type="button" class="o_ActivityMarkDonePopover_discardButton btn btn-sm btn-link" t-on-click="_onClickDiscard"> + Discard + </button> </div> </t> </div> diff --git a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover_tests.js b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover_tests.js index 9f94a5bbef1..0c019b2b3c4 100644 --- a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover_tests.js +++ b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover_tests.js @@ -124,10 +124,10 @@ QUnit.test('activity with force next mark done popover simplest layout', async f '.o_ActivityMarkDonePopover_doneButton', "Popover component should NOT contain the done button" ); - assert.containsNone( + assert.containsOnce( document.body, '.o_ActivityMarkDonePopover_discardButton', - "Popover component should NOT contain the discard button" + "Popover component should contain the discard button" ); }); |