From 602807acdf20ff4f75a1abb7f5fa1be4db3f532d Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Tue, 24 Jul 2018 17:01:44 +0200 Subject: [FIX] website: improve/fix menu, copy on unlink, clone page, unique_path, sale_report, ... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix bug from the initial poc of JOV Fix menu creation - creating a menu would create a 'container' menu in the DB (.create is call without website_id) then writing on it would copy (if condition to cow) the menu with a website_id leaving the first one as a menu container unused. - website_menu should always have a website_id we dont want to support the multiwebsite system that allow to have generic/specific menu unlink/write is useless now since we always have a website_id Make unique_path website dependent, 2 distinct website can have a page with same name Make Sale report multiwebsite compliant Make website_id on sale_order / account.invoice as a related stored from partner_id. Co-authored-by: Derie Romain Co-authored-by: Kersten Jérémy --- addons/website/static/src/js/content/menu.js | 2 +- addons/website/static/src/js/content/website_root.js | 2 +- addons/website/static/src/js/menu/content.js | 2 +- addons/website/static/src/js/widgets/theme.js | 3 +-- addons/website/static/src/scss/website.ui.scss | 2 +- addons/website/static/src/xml/website.backend.xml | 4 ++-- addons/website/static/src/xml/website.pageProperties.xml | 16 ++++++++-------- 7 files changed, 15 insertions(+), 16 deletions(-) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/js/content/menu.js b/addons/website/static/src/js/content/menu.js index 6effb471ec9..3511f51a70f 100644 --- a/addons/website/static/src/js/content/menu.js +++ b/addons/website/static/src/js/content/menu.js @@ -67,7 +67,7 @@ sAnimation.registry.affixMenu = sAnimation.Class.extend({ // Reset opened menus this.$dropdowns.removeClass('show'); - this.$navbarCollapses.removeClass('in').attr('aria-expanded', false); + this.$navbarCollapses.removeClass('show').attr('aria-expanded', false); }, }); diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js index 0f3fff53dfc..a51c8011e92 100644 --- a/addons/website/static/src/js/content/website_root.js +++ b/addons/website/static/src/js/content/website_root.js @@ -287,7 +287,7 @@ var WebsiteRoot = BodyManager.extend({ * @param {OdooEvent} ev */ _multiWebsiteSwitch: function (ev) { - var website_id_to_switch_to = ev.target.getAttribute('website-id'); + var website_id_to_switch_to = ev.currentTarget.getAttribute('website-id'); this._rpc({ route: '/website/force_website', params: { diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index bcb46553b65..91494a4018b 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -542,7 +542,7 @@ var EditMenuDialog = weWidgets.Dialog.extend({ this._rpc({ model: 'website.menu', method: 'save', - args: [[context.website_id], { data: data, to_delete: self.to_delete }], + args: [context.website_id, { data: data, to_delete: self.to_delete }], context: context, }).then(function () { return _super(); diff --git a/addons/website/static/src/js/widgets/theme.js b/addons/website/static/src/js/widgets/theme.js index 50434604677..ce73fd35d3d 100644 --- a/addons/website/static/src/js/widgets/theme.js +++ b/addons/website/static/src/js/widgets/theme.js @@ -55,7 +55,6 @@ var ThemeCustomizeDialog = Dialog.extend({ */ start: function () { var self = this; - this._generateDialogHTML(); this.$modal.addClass('o_theme_customize_modal'); @@ -77,7 +76,7 @@ var ThemeCustomizeDialog = Dialog.extend({ this._loadViews() ); }, - + //-------------------------------------------------------------------------- // Private //-------------------------------------------------------------------------- diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss index a7be7e98290..f146b3de677 100644 --- a/addons/website/static/src/scss/website.ui.scss +++ b/addons/website/static/src/scss/website.ui.scss @@ -38,7 +38,7 @@ body.o_connected_user { } } .o_menu_systray { - a { + > li > a { padding: 0 $grid-gutter-width/2; &.css_edit_dynamic{ diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index 6bdb10f24c6..5508d4be9d9 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -70,9 +70,9 @@ -
+
- diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml index 7ac590cda2f..cf4719d5951 100644 --- a/addons/website/static/src/xml/website.pageProperties.xml +++ b/addons/website/static/src/xml/website.pageProperties.xml @@ -45,7 +45,7 @@
  • Publish
    • -
    +
    @@ -88,7 +88,7 @@
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -- cgit v1.2.3