From ae6db1a5f410f66fb7fb8521ae09e2429d2b18bf Mon Sep 17 00:00:00 2001 From: Romain Derie Date: Mon, 2 Sep 2019 11:48:57 +0000 Subject: [PATCH] [REM] account, project, sale, *: remove dead code 'return_label' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Odoo 9.0, the `return_label` in url was not working anymore. What it did before 9.0 is add an item in the breadcrumb which once clicked would redirect to the frontend. This was handled in the `do_load_state` of the action manager in JS. We don't need to reimplement that behavior as now we have the 'Go to website' stat button. Thus we remove the code. Closes #36325 Signed-off-by: Jérémy Kersten (jke) --- addons/account/views/account_portal_templates.xml | 2 +- addons/project/views/project_portal_templates.xml | 4 ++-- addons/sale/views/sale_portal_templates.xml | 2 +- addons/sale_quotation_builder/views/sale_portal_templates.xml | 2 +- addons/website/static/src/js/content/website_root.js | 2 +- addons/website/views/website_navbar_templates.xml | 2 +- addons/website/views/website_templates.xml | 2 +- addons/website_blog/views/website_blog_components.xml | 4 ++-- addons/website_sale/views/templates.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml index bb8c0cf245a..deff73f9ebf 100644 --- a/addons/account/views/account_portal_templates.xml +++ b/addons/account/views/account_portal_templates.xml @@ -76,7 +76,7 @@ - + diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml index 2ac7e604693..1b0231ccb97 100644 --- a/addons/project/views/project_portal_templates.xml +++ b/addons/project/views/project_portal_templates.xml @@ -68,7 +68,7 @@ - + @@ -167,7 +167,7 @@ - + diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index a1f79c45f63..5ae6da1fc66 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -117,7 +117,7 @@ - + diff --git a/addons/sale_quotation_builder/views/sale_portal_templates.xml b/addons/sale_quotation_builder/views/sale_portal_templates.xml index 4c5b2f6dc95..fe8b0056d10 100644 --- a/addons/sale_quotation_builder/views/sale_portal_templates.xml +++ b/addons/sale_quotation_builder/views/sale_portal_templates.xml @@ -27,7 +27,7 @@ - + This is a preview of the sale order template. diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js index 70f8c5014f5..8c27fb5736e 100644 --- a/addons/website/static/src/js/content/website_root.js +++ b/addons/website/static/src/js/content/website_root.js @@ -170,7 +170,7 @@ var WebsiteRoot = publicRootData.PublicRoot.extend({ + '
' + _.str.sprintf( _t('It might be possible to edit the relevant items or fix the issue in the classic Odoo interface'), - '/web#return_label=Website&model=' + $data.data('object') + '&id=' + $data.data('id') + '/web#model=' + $data.data('object') + '&id=' + $data.data('id') ), }), }).open(); diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml index 37d3ada9b50..8b6db5eb17d 100644 --- a/addons/website/views/website_navbar_templates.xml +++ b/addons/website/views/website_navbar_templates.xml @@ -164,7 +164,7 @@ Toggle Dropdown diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 330dc48c0cb..dd237e8a19b 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -457,7 +457,7 @@