diff options
4 files changed, 7 insertions, 4 deletions
diff --git a/addons/website_links/static/src/js/test_ui_flow.js b/addons/website_links/static/src/js/test_ui_flow.js index 4d8c7def0f9..584fc38c65d 100644 --- a/addons/website_links/static/src/js/test_ui_flow.js +++ b/addons/website_links/static/src/js/test_ui_flow.js @@ -53,8 +53,12 @@ tour.register('website_links_tour', { }, // 3. Check that counter got incremented and charts are correctly displayed { + content: "filter recently used links", + trigger: '#filter-recently-used-links', + }, + { content: "visit link stats page", - trigger: '#o_website_links_recent_links a:containsExact("Stats"):first()', + trigger: '#o_website_links_recent_links a:containsExact("Stats"):first', }, { content: "check click number and ensure graphs are initialized", diff --git a/addons/website_links/static/src/js/website_links_charts.js b/addons/website_links/static/src/js/website_links_charts.js index bd2e3ba2747..64da6aa6388 100644 --- a/addons/website_links/static/src/js/website_links_charts.js +++ b/addons/website_links/static/src/js/website_links_charts.js @@ -183,6 +183,7 @@ sAnimations.registry.websiteLinksCharts = sAnimations.Class.extend({ $('#all_time_charts').prepend(_t("There is no data to show")); $('#last_month_charts').prepend(_t("There is no data to show")); $('#last_week_charts').prepend(_t("There is no data to show")); + return; } var formattedClicksByDay = {}; diff --git a/addons/website_links/tests/test_ui.py b/addons/website_links/tests/test_ui.py index 58a697ef7a1..6a8e317eab1 100644 --- a/addons/website_links/tests/test_ui.py +++ b/addons/website_links/tests/test_ui.py @@ -1,13 +1,11 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. import odoo.tests -import unittest @odoo.tests.common.tagged('post_install', '-at_install') class TestUi(odoo.tests.HttpCase): - @unittest.skip("Race condition on runbot or on local with Docker. Merging the test skipped for history purpose as the tour has been reviewed.") def test_01_test_ui(self): self.env['link.tracker'].create({ 'campaign_id': 2, diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml index aca362bc40c..626ec232e53 100644 --- a/addons/website_links/views/website_links_template.xml +++ b/addons/website_links/views/website_links_template.xml @@ -87,7 +87,7 @@ </div> <h2 class="o_page_header">Your tracked links - <small class="float-right d-none d-md-block mt16" id="filters"> + <small class="float-right d-none d-md-block" id="filters"> <ul class="nav nav-tabs nav-tabs-inline graph-tabs" role="tablist"> <li class="nav-item"><a aria-controls="filter-newest-links" href="#" class="nav-link active" id="filter-newest-links" role="tab" data-toggle="tab">Newest</a></li> <li class="nav-item"><a aria-controls="filter-most-clicked-links" href="#" class="nav-link" id="filter-most-clicked-links" role="tab" data-toggle="tab">Most Clicked</a></li> |