From a6ce0597c891261e828b5c752bc2c0be4cd9ecab Mon Sep 17 00:00:00 2001 From: Andro Gvivradze Date: Tue, 8 Nov 2022 08:25:30 +0000 Subject: [PATCH] [FIX] event, website_event: fix event tours Due to owl conversions the namings of few buttons changed, thus event_tour and website_event_tour were broken. Commit fixes this issue. At the same time, test didn't understand the change with datepicker in input field. Now test moves to next stage whenever the date input field is clicked, and I added "apply change" step to event_tour to make sure that user saves their changes. Task-3060511 closes odoo/odoo#105724 X-original-commit: 10a2cf33c00915a26a473411793e9d20af86a2ac Signed-off-by: Thibault Delavallee (tde) --- addons/event/i18n/event.pot | 18 ++++++++++++++++-- .../event/static/src/js/tours/event_tour.js | 19 ++++++++++++------- .../static/src/js/tours/event_tour.js | 5 +---- .../static/tests/tours/website_event.js | 16 +++++----------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 3c61f70abfb..a615e35cf14 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -60,7 +60,7 @@ msgstr "" #: model:ir.actions.report,print_report_name:event.action_report_event_registration_foldable_badge msgid "" "'Foldable Badge - %s - %s' % ((object.event_id.name or " -"'Event').replace('/',''), object.name.replace('/',''))" +"'Event').replace('/',''), (object.name or '').replace('/',''))" msgstr "" #. module: event @@ -72,7 +72,7 @@ msgstr "" #: model:ir.actions.report,print_report_name:event.action_report_event_registration_full_page_ticket msgid "" "'Full Page Ticket - %s - %s' % ((object.event_id.name or " -"'Event').replace('/',''), object.name.replace('/',''))" +"'Event').replace('/',''), (object.name or '').replace('/',''))" msgstr "" #. module: event @@ -842,6 +842,13 @@ msgstr "" msgid "Announced" msgstr "" +#. module: event +#. openerp-web +#: code:addons/event/static/src/js/tours/event_tour.js:0 +#, python-format +msgid "Apply change." +msgstr "" + #. module: event #: model_terms:ir.ui.view,arch_db:event.view_event_search #: model_terms:ir.ui.view,arch_db:event.view_registration_search @@ -2464,6 +2471,13 @@ msgstr "" msgid "Online Ticketing" msgstr "" +#. module: event +#. openerp-web +#: code:addons/event/static/src/js/tours/event_tour.js:0 +#, python-format +msgid "Open date range picker. Pick a Start date for your event" +msgstr "" + #. module: event #: model_terms:event.event,description:event.event_0 msgid "" diff --git a/addons/event/static/src/js/tours/event_tour.js b/addons/event/static/src/js/tours/event_tour.js index 88caff125db..9d101ce9143 100644 --- a/addons/event/static/src/js/tours/event_tour.js +++ b/addons/event/static/src/js/tours/event_tour.js @@ -44,22 +44,27 @@ tour.register('event_tour', { position: 'bottom', width: 175, }, { - trigger: '.o_event_form_view input[name="name"]', + trigger: '.o_event_form_view input[id="name"]', content: Markup(_t("This is the name your guests will see when registering.")), run: 'text Odoo Experience 2020', }, { - trigger: '.o_event_form_view input[name="date_end"]', - content: Markup(_t("When will your event take place? Select the start and end dates and click Apply.")), + trigger: '.o_event_form_view div[name="date_end"]', + content: _t("Open date range picker. Pick a Start date for your event"), run: function () { - $('input[name="date_begin"]').val('09/30/2020 08:00:00').change(); - $('input[name="date_end"]').val('10/02/2020 23:00:00').change(); + $('input[id="date_begin"]').val('09/30/2020 08:00:00').change(); + $('input[id="date_end"]').val('10/02/2020 23:00:00').change(); + $('.o_event_form_view input[id="date_end"]').click(); }, +}, { + content: _t("Apply change."), + trigger: '.daterangepicker .applyBtn', + in_modal: false, }, { trigger: '.o_event_form_view div[name="event_ticket_ids"] .o_field_x2many_list_row_add a', content: Markup(_t("Ticket types allow you to distinguish your attendees. Let's create a new one.")), -}, ...new EventAdditionalTourSteps()._get_website_event_steps(), { +}, tour.stepUtils.autoExpandMoreButtons(), +...new EventAdditionalTourSteps()._get_website_event_steps(), { trigger: '.o_event_form_view div[name="stage_id"]', - extra_trigger: 'div.o_form_buttons_view:not(.o_hidden)', content: _t("Now that your event is ready, click here to move it to another stage."), position: 'bottom', }, { diff --git a/addons/website_event/static/src/js/tours/event_tour.js b/addons/website_event/static/src/js/tours/event_tour.js index 4f629ed59aa..b8818a6bb45 100644 --- a/addons/website_event/static/src/js/tours/event_tour.js +++ b/addons/website_event/static/src/js/tours/event_tour.js @@ -15,23 +15,20 @@ EventAdditionalTourSteps.include({ _get_website_event_steps: function () { this._super.apply(this, arguments); return [{ - trigger: '.o_event_form_view button[name="is_published"]', + trigger: '.o_event_form_view button[title="Unpublished"]', content: Markup(_t("Use this shortcut to easily access your event web page.")), position: 'bottom', }, { trigger: '.o_edit_website_container a', - extra_trigger: 'iframe .o_wevent_event', content: Markup(_t("With the Edit button, you can customize the web page visitors will see when registering.")), position: 'bottom', }, { trigger: '#oe_snippets.o_loaded div[name="Image - Text"] .oe_snippet_thumbnail', - extra_trigger: 'iframe .o_wevent_event', content: Markup(_t("Drag and Drop this snippet below the event title.")), position: 'bottom', run: 'drag_and_drop iframe #o_wevent_event_main_col', }, { trigger: 'button[data-action="save"]', - extra_trigger: 'iframe .o_wevent_event', content: Markup(_t("Don't forget to click save when you're done.")), position: 'bottom', }, { diff --git a/addons/website_event/static/tests/tours/website_event.js b/addons/website_event/static/tests/tours/website_event.js index 3eb19e0c557..5947e463b07 100644 --- a/addons/website_event/static/tests/tours/website_event.js +++ b/addons/website_event/static/tests/tours/website_event.js @@ -3,7 +3,6 @@ odoo.define("website_event.tour", function (require) { const {_t} = require("web.core"); const {Markup} = require('web.utils'); - const time = require('web.time'); const wTourUtils = require('website.tour_utils'); @@ -12,7 +11,6 @@ odoo.define("website_event.tour", function (require) { url: "/", }, [{ content: _t("Click here to add new content to your website."), - extra_trigger: 'iframe #wrapwrap', trigger: ".o_menu_systray .o_new_content_container > a", consumeVisibleOnly: true, position: 'bottom', @@ -26,16 +24,12 @@ odoo.define("website_event.tour", function (require) { run: 'text Technical Training', position: "left", }, { - content: _t("Open date range picker."), - trigger: '.modal-dialog [name=date_begin] input', - }, { - trigger: '.modal-dialog [name=date_begin] input', - extra_trigger: '.daterangepicker', - content: _t("Pick a Start date for your event"), + trigger: '.modal-dialog div[name=date_begin]', + content: _t("Open date range picker. Pick a Start date for your event"), run: function () { - const daterangepicker = this.$anchor.data('daterangepicker'); - daterangepicker.setStartDate(moment().format(time.getLangDatetimeFormat())); - daterangepicker.setEndDate(moment().add(1, "d").format(time.getLangDatetimeFormat())); + $('input[id="date_begin"]').val('09/30/2020 08:00:00').change(); + $('input[id="date_end"]').val('10/02/2020 23:00:00').change(); + $('input[id="date_begin"]').click(); } }, { content: _t("Apply change."),