Skip to content

Commit edff5d7

Browse files
committed
[FIX] *: various random small fixes
1 parent 9e3a93c commit edff5d7

File tree

37 files changed

+38
-21
lines changed

37 files changed

+38
-21
lines changed

addons/html_builder/static/src/builder.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<button type="button" t-on-click="() => this.redo()" class="btn btn-secondary fa fa-repeat" t-att-disabled="!state.canRedo"/>
1010
</div>
1111
<div class="d-flex">
12-
<div class="mt-2" title="Mysterious Egg">
13-
<!-- remove this before merge, otherwise people will see this egg -->
14-
<svg width="1.1em" height="1.5em" viewBox="0 0 100 140" xmlns="http://www.w3.org/2000/svg"><ellipse cx="50" cy="80" rx="40" ry="55" fill="#F4E1C6" stroke="#E0C4A8" stroke-width="4"/></svg>
15-
</div>
1612
<button t-on-click="onMobilePreviewClick" type="button" class="btn btn-secondary" data-action="mobile" title="Mobile Preview" accesskey="v"><span class="fa fa-mobile"/></button>
1713
<button type="button" t-on-click="discard" class="btn btn-secondary" data-action="cancel" title="Tip: Esc to preview" accesskey="j">Discard</button>
1814
<button type="button" t-on-click="save" class="btn btn-primary" data-action="save" accesskey="s">Save</button>

addons/mail/push-to-talk-extension/content.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
const EXT_ID = "mdiacebcbkmjjlpclnbcgiepgifcnpmg";
55

66
chrome.runtime.onMessage.addListener(function (request, sender) {
7-
if (sender.id === EXT_ID) {
7+
if (location.origin !== "null" && sender.id === EXT_ID) {
88
window.postMessage(request, location.origin);
99
}
1010
});

addons/mail/static/src/discuss/call/common/ptt_extension_service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const pttExtensionHookService = {
9393
return;
9494
}
9595
const version = parseVersion(await versionPromise);
96-
if (!location.origin) {
96+
if (location.origin === "null") {
9797
return;
9898
}
9999
if (version.isLowerThan("1.0.0.2")) {

addons/mail/tests/discuss/test_ui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from odoo import Command
55
from odoo.addons.base.tests.common import HttpCaseWithUserDemo
66

7+
78
@odoo.tests.tagged('post_install', '-at_install')
89
class TestUi(HttpCaseWithUserDemo):
910

addons/mass_mailing_sms/tests/test_mailing_ui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from odoo.tests import HttpCase, tagged, users
44

5+
56
@tagged('post_install', '-at_install', 'mail_activity')
67
class TestMailingUi(HttpCase):
78

addons/project_todo/tests/test_todo_ui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from odoo.addons.base.tests.common import HttpCaseWithUserDemo
66
import unittest
77

8+
89
@tagged('post_install', '-at_install')
910
class TestTodoUi(HttpCaseWithUserDemo):
1011

addons/survey/tests/test_survey_ui_certification.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from odoo.addons.base.tests.common import HttpCaseWithUserDemo
66
import unittest
77

8+
89
# TODO master-mysterious-egg fix error
910
@unittest.skip("prepare mysterious-egg for merging")
1011
@odoo.tests.common.tagged('post_install', '-at_install')

addons/survey/tests/test_survey_ui_feedback.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from odoo.addons.base.tests.common import HttpCaseWithUserDemo
66
import unittest
77

8+
89
# TODO master-mysterious-egg fix error
910
@unittest.skip("prepare mysterious-egg for merging")
1011
@odoo.tests.common.tagged('post_install', '-at_install')

addons/test_website/tests/test_custom_snippet.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from odoo.tools import mute_logger
66
import unittest
77

8+
89
# TODO master-mysterious-egg fix error
910
@unittest.skip("prepare mysterious-egg for merging")
1011
@odoo.tests.common.tagged('post_install', '-at_install')

addons/test_website/tests/test_form.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from odoo.tests import tagged, HttpCase
44
import unittest
55

6+
67
# TODO master-mysterious-egg fix error
78
@unittest.skip("prepare mysterious-egg for merging")
89
@tagged('-at_install', 'post_install')

addons/test_website/tests/test_image_upload_progress.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from odoo import http
1010
import unittest
1111

12+
1213
# TODO master-mysterious-egg fix error
1314
@unittest.skip("prepare mysterious-egg for merging")
1415
@odoo.tests.common.tagged('post_install', '-at_install')

addons/test_website/tests/test_media.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from odoo.tools import mute_logger
88
import unittest
99

10+
1011
# TODO master-mysterious-egg fix error
1112
@unittest.skip("prepare mysterious-egg for merging")
1213
@odoo.tests.common.tagged('post_install', '-at_install')

addons/test_website/tests/test_snippet_background_video.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import odoo.tests
44
import unittest
55

6+
67
@odoo.tests.common.tagged('post_install', '-at_install')
78
class TestSnippetBackgroundVideo(odoo.tests.HttpCase):
89
# TODO master-mysterious-egg fix error

addons/test_website/tests/test_systray.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from odoo.addons.base.tests.common import HttpCase
88

9+
910
@tagged('post_install', '-at_install')
1011
class TestSystray(HttpCase):
1112

addons/test_website_modules/tests/test_configurator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from odoo.addons.website.tests.test_configurator import TestConfiguratorCommon
66
import unittest
77

8+
89
@odoo.tests.common.tagged('post_install', '-at_install')
910
class TestConfigurator(TestConfiguratorCommon):
1011

addons/test_website_slides_full/tests/test_ui_wslides.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from odoo.addons.website_slides.tests.test_ui_wslides import TestUICommon
99
import unittest
1010

11+
1112
@tests.common.tagged('post_install', '-at_install')
1213
class TestUi(TestUICommon):
1314

addons/web/tooling/_eslintignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ web_gantt/static/tests/legacy/**/*
8282
!addons/html_builder
8383
!addons/html_builder/**/*
8484

85+
# Whitelist parts of website
86+
!addons/website/static/src/builder
87+
!addons/website/static/src/builder/**/*
88+
!addons/website/static/src/client_actions/website_preview/
89+
!addons/website/static/src/client_actions/website_preview/**/*
90+
8591
# planning
8692
# whitelist new code
8793
!planning

addons/website/static/src/builder/builder_urlpicker.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export class BuilderUrlPicker extends Component {
7373
}
7474
}
7575

76-
7776
class UrlPickerPlugin extends Plugin {
7877
static id = "urlPickerPlugin";
7978

addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { LayoutColumnOption, LayoutGridOption, LayoutOption } from "./layout_opt
1212
import { withSequence } from "@html_editor/utils/resource";
1313
import { LAYOUT, LAYOUT_COLUMN, LAYOUT_GRID } from "@website/builder/option_sequence";
1414

15-
1615
class LayoutOptionPlugin extends Plugin {
1716
static id = "LayoutOption";
1817
static dependencies = ["clone", "selection"];

addons/website/static/src/builder/plugins/options/visibility_option_plugin.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ import { pyToJsLocale } from "@web/core/l10n/utils";
55
import { getElementsWithOption } from "@html_builder/utils/utils";
66
import { VisibilityOption } from "./visibility_option";
77
import { withSequence } from "@html_editor/utils/resource";
8-
import {
9-
CONDITIONAL_VISIBILITY,
10-
DEVICE_VISIBILITY,
11-
} from "@website/builder/option_sequence";
8+
import { CONDITIONAL_VISIBILITY, DEVICE_VISIBILITY } from "@website/builder/option_sequence";
129

1310
export const VISIBILITY_OPTION_SELECTOR = "section, .s_hr";
1411
export const DEVICE_VISIBILITY_OPTION_SELECTOR = "section .row > div";

addons/website/static/src/client_actions/website_preview/new_content_modal.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { InstallModuleDialog } from "./install_module_dialog";
2-
import {
3-
MODULE_STATUS,
4-
NewContentElement,
5-
} from "./new_content_element";
2+
import { MODULE_STATUS, NewContentElement } from "./new_content_element";
63
import { Component, onWillStart, useState, xml } from "@odoo/owl";
74
import { useHotkey } from "@web/core/hotkeys/hotkey_hook";
85
import { _t } from "@web/core/l10n/translation";

addons/website/static/src/client_actions/website_preview/website_builder_action.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ export class WebsiteBuilder extends Component {
168168
isMobile: this.websiteContext.isMobile,
169169
Plugins: websitePlugins,
170170
config: { initialTarget: this.target, initialTab: this.initialTab },
171-
getThemeTab: () => odoo.loader.modules.get("@website/builder/plugins/theme/theme_tab").ThemeTab,
171+
getThemeTab: () =>
172+
odoo.loader.modules.get("@website/builder/plugins/theme/theme_tab").ThemeTab,
172173
};
173174
}
174175

addons/website/tests/test_grid_layout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import odoo.tests
44
from odoo.addons.website.tools import create_image_attachment
55

6+
67
@odoo.tests.common.tagged('post_install', '-at_install')
78
class TestWebsiteGridLayout(odoo.tests.HttpCase):
89

@@ -11,7 +12,6 @@ def test_01_replace_grid_image(self):
1112
create_image_attachment(self.env, '/web/image/website.s_banner_default_image', 's_banner_default_image2.jpg')
1213
self.start_tour(self.env['website'].get_client_action_url('/'), 'website_replace_grid_image', login="admin")
1314

14-
1515
def test_02_scroll_to_new_grid_item(self):
1616
create_image_attachment(self.env, '/web/image/website.s_banner_default_image', 's_banner_default_image.jpg')
1717
self.start_tour(self.env['website'].get_client_action_url('/'), 'scroll_to_new_grid_item', login='admin')

addons/website_blog/tests/test_ui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import odoo.tests
55
from odoo.addons.website_blog.tests.common import TestWebsiteBlogCommon
66

7+
78
@odoo.tests.tagged('post_install', '-at_install')
89
class TestWebsiteBlogUi(odoo.tests.HttpCase, TestWebsiteBlogCommon):
910
@classmethod

addons/website_crm/tests/test_website_crm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import odoo.tests
55
import unittest
66

7+
78
# TODO master-mysterious-egg fix error
89
@unittest.skip("prepare mysterious-egg for merging")
910
@odoo.tests.tagged('post_install', '-at_install')

addons/website_event/tests/test_website_event.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from odoo.tests.common import users
1515
import unittest
1616

17+
1718
# TODO master-mysterious-egg fix error
1819
@unittest.skip("prepare mysterious-egg for merging")
1920
class TestEventRegisterUTM(HttpCase, TestEventOnlineCommon):
@@ -53,6 +54,7 @@ def test_event_registration_utm_values(self):
5354
self.assertEqual(new_registration.utm_source_id, self.env.ref('utm.utm_source_newsletter'))
5455
self.assertEqual(new_registration.utm_medium_id, self.env.ref('utm.utm_medium_email'))
5556

57+
5658
# TODO master-mysterious-egg fix error
5759
@unittest.skip("prepare mysterious-egg for merging")
5860
@tagged('post_install', '-at_install')

addons/website_mass_mailing/tests/test_snippets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from odoo.tests import HttpCase, tagged
55
import unittest
66

7+
78
@tagged('post_install', '-at_install')
89
class TestSnippets(HttpCase):
910

addons/website_sale/tests/test_customize.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from odoo.addons.website.tests.common import HttpCaseWithWebsiteUser
99
import unittest
1010

11+
1112
# TODO master-mysterious-egg fix error
1213
@unittest.skip("prepare mysterious-egg for merging")
1314
@tagged('post_install', '-at_install')

addons/website_sale/tests/test_delivery_ui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import odoo.tests
44
from odoo.fields import Command
55

6+
67
@odoo.tests.tagged('post_install', '-at_install')
78
class TestUi(odoo.tests.HttpCase):
89
def test_01_free_delivery_when_exceed_threshold(self):

addons/website_sale/tests/test_sale_process.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
_logger = logging.getLogger(__name__)
1414

15+
1516
# TODO master-mysterious-egg fix error
1617
@unittest.skip("prepare mysterious-egg for merging")
1718
@tagged('post_install', '-at_install')

addons/website_sale/tests/test_website_sale_combo_configurator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
from odoo.addons.website_sale.tests.common import WebsiteSaleCommon
77

8+
89
@tagged('post_install', '-at_install')
910
class TestWebsiteSaleComboConfigurator(HttpCase, WebsiteSaleCommon):
1011
def test_website_sale_combo_configurator(self):

addons/website_sale/tests/test_website_sale_reorder_from_portal.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from odoo.fields import Command
44
from odoo.tests import tagged
5-
import unittest
65

76
from odoo.addons.base.tests.common import HttpCaseWithUserPortal
87
from odoo.addons.website.tools import MockRequest

addons/website_sale/tests/test_website_sale_show_compare_list_price.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from odoo.fields import Command
44
from odoo.tests import tagged
5-
import unittest
65

76
from odoo.addons.account.tests.common import AccountTestInvoicingHttpCommon
87

addons/website_sale/tests/test_website_sale_snippets.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import logging
44

55
from odoo.tests import HttpCase, tagged
6-
import unittest
76

87
from odoo.addons.website.tools import MockRequest
98

addons/website_sale_stock/tests/test_website_sale_stock_stock_notification.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from odoo.tests import tagged
55
from odoo.tests.common import HttpCase
66

7+
78
@tagged('post_install', '-at_install')
89
class TestStockNotificationProduct(HttpCase):
910
@classmethod

addons/website_sale_wishlist/tests/test_wishlist_process.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from odoo.tests import HttpCase, tagged
55
import unittest
66

7+
78
@tagged('-at_install', 'post_install')
89
class TestWishlistProcess(HttpCase):
910

odoo/addons/test_main_flows/tests/test_flow.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ def test_company_switch_access_error_debug(self):
191191
with mute_logger("odoo.http"):
192192
self.start_tour(f"/odoo/action-{act_window.id}?debug=assets", "test_company_switch_access_error", login="admin", cookies={"cids": current_companies})
193193

194+
194195
# TODO master-mysterious-egg fix error
195196
@unittest.skip("prepare mysterious-egg for merging")
196197
@odoo.tests.tagged('post_install', '-at_install')

0 commit comments

Comments
 (0)