From e6097043b9e062b64d5940d48d393f307f67889f Mon Sep 17 00:00:00 2001 From: Maryam Kia Date: Tue, 6 Feb 2024 15:49:11 +0100 Subject: [PATCH] [FIX] calendar: restore schedule call activity without event Since PR #137969, the `save` button is no longer available in schedule activity wizard. This PR makes `schedule` button available for call activities like other activities (except meeting), so user can create a call activity without going to calendar view. Also, we have to consider `has_error` in creating activity so if there is an error, user couldn't access to `schedule` button. This field is correctly placed in `mail.mail_activity_schedule_view_form` view but not in the inherited view in `calendar`. task-3668732 closes odoo/odoo#152893 Signed-off-by: Maryam Kia (maki) --- .../wizard/mail_activity_schedule_views.xml | 2 +- .../mail_activity_schedule_from_chatter.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/calendar/wizard/mail_activity_schedule_views.xml b/addons/calendar/wizard/mail_activity_schedule_views.xml index aee26589d73..8f398a38a87 100644 --- a/addons/calendar/wizard/mail_activity_schedule_views.xml +++ b/addons/calendar/wizard/mail_activity_schedule_views.xml @@ -13,7 +13,7 @@ activity_category == 'meeting' - activity_category in ('meeting', 'phonecall') or id + has_error or activity_category == 'meeting' or id activity_category == 'meeting' diff --git a/addons/mail/static/tests/tours/mail_activity_schedule_from_chatter.js b/addons/mail/static/tests/tours/mail_activity_schedule_from_chatter.js index 97c1c4f455f..9a9e0ad656d 100644 --- a/addons/mail/static/tests/tours/mail_activity_schedule_from_chatter.js +++ b/addons/mail/static/tests/tours/mail_activity_schedule_from_chatter.js @@ -8,6 +8,23 @@ registry.category("web_tour.tours").add("mail_activity_schedule_from_chatter", { { trigger: "button:contains('Activities')", }, + { + trigger: "input[id*='activity_type_id']", + run: "click", + }, + { + trigger: ".dropdown-item:contains('Call')", + }, + { + extra_trigger: "button:contains('Schedule')", + trigger: "input[id*='activity_type_id']", + run: function (action_helper) { + setTimeout(() => action_helper.click(), 100); + }, + }, + { + trigger: ".dropdown-item:contains('To-Do')", + }, { trigger: "div[name='summary'] input", run: "text Play Mario Party",