summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorRomain Derie <rde@odoo.com>2019-09-02 11:48:57 +0000
committerRomain Derie <rde@odoo.com>2019-10-02 07:13:27 +0000
commitae6db1a5f410f66fb7fb8521ae09e2429d2b18bf (patch)
treeeb7d6ba72a34ed14249e83cc08f6b7e5bf3e1442 /addons
parent9b38bcec1269f0e72606e774f5e1f5f4a78baa89 (diff)
[REM] account, project, sale, *: remove dead code 'return_label'
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) <jke@openerp.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/account/views/account_portal_templates.xml2
-rw-r--r--addons/project/views/project_portal_templates.xml4
-rw-r--r--addons/sale/views/sale_portal_templates.xml2
-rw-r--r--addons/sale_quotation_builder/views/sale_portal_templates.xml2
-rw-r--r--addons/website/static/src/js/content/website_root.js2
-rw-r--r--addons/website/views/website_navbar_templates.xml2
-rw-r--r--addons/website/views/website_templates.xml2
-rw-r--r--addons/website_blog/views/website_blog_components.xml4
-rw-r--r--addons/website_sale/views/templates.xml2
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 @@
<xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
<t t-set="o_portal_fullwidth_alert" groups="sales_team.group_sale_salesman,account.group_account_invoice">
<t t-call="portal.portal_back_in_edit_mode">
- <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (invoice._name, invoice.id, invoice.env.ref('account.action_move_out_invoice_type').id)"/>
+ <t t-set="backend_url" t-value="'/web#model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (invoice._name, invoice.id, invoice.env.ref('account.action_move_out_invoice_type').id)"/>
</t>
</t>
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 @@
<t t-call="portal.portal_layout">
<t t-set="o_portal_fullwidth_alert" groups="project.group_project_user">
<t t-call="portal.portal_back_in_edit_mode">
- <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=project.project&amp;id=%s&amp;view_type=form' % (project.id)"/>
+ <t t-set="backend_url" t-value="'/web#model=project.project&amp;id=%s&amp;view_type=form' % (project.id)"/>
</t>
</t>
@@ -167,7 +167,7 @@
<t t-call="portal.portal_layout">
<t t-set="o_portal_fullwidth_alert" groups="project.group_project_user">
<t t-call="portal.portal_back_in_edit_mode">
- <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=project.task&amp;id=%s&amp;view_type=form' % (task.id)"/>
+ <t t-set="backend_url" t-value="'/web#model=project.task&amp;id=%s&amp;view_type=form' % (task.id)"/>
</t>
</t>
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 @@
<xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
<t t-set="o_portal_fullwidth_alert" groups="sales_team.group_sale_salesman">
<t t-call="portal.portal_back_in_edit_mode">
- <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (sale_order._name, sale_order.id, action.id)"/>
+ <t t-set="backend_url" t-value="'/web#model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (sale_order._name, sale_order.id, action.id)"/>
</t>
</t>
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 @@
<body>
<t t-set="o_portal_fullwidth_alert">
<t t-call="portal.portal_back_in_edit_mode">
- <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (template._name, template.id, request.env.ref('sale_management.sale_order_template_action').id)"/>
+ <t t-set="backend_url" t-value="'/web#model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (template._name, template.id, request.env.ref('sale_management.sale_order_template_action').id)"/>
<t t-set="custom_html">This is a preview of the sale order template.</t>
</t>
</t>
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({
+ '<br/>'
+ _.str.sprintf(
_t('It might be possible to edit the relevant items or fix the issue in <a href="%s">the classic Odoo interface</a>'),
- '/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 @@
<span class="sr-only">Toggle Dropdown</span>
</a>
<div class="dropdown-menu" role="menu">
- <a role="menuitem" style="text-align: left;" t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{main_object._name}&amp;id=#{main_object.id}&amp;action=#{action}&amp;menu_id=#{backend_menu_id}"
+ <a role="menuitem" style="text-align: left;" t-attf-href="/web#view_type=form&amp;model=#{main_object._name}&amp;id=#{main_object.id}&amp;action=#{action}&amp;menu_id=#{backend_menu_id}"
class="dropdown-item" title='Edit in backend' id="edit-in-backend">Edit in backend</a>
</div>
</li>
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 @@
<button type="button" t-attf-class="btn btn-default dropdown-toggle dropdown-toggle-split" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown"/>
<div class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
<t t-raw="0"/>
- <a role="menuitem" t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{object._name}&amp;id=#{object.id}&amp;action=#{action}&amp;menu_id=#{menu or object.env.ref('website.menu_website_configuration').id}"
+ <a role="menuitem" t-attf-href="/web#view_type=form&amp;model=#{object._name}&amp;id=#{object.id}&amp;action=#{action}&amp;menu_id=#{menu or object.env.ref('website.menu_website_configuration').id}"
title='Edit in backend' class="dropdown-item" t-if="publish_edit">Edit</a>
</div>
</div>
diff --git a/addons/website_blog/views/website_blog_components.xml b/addons/website_blog/views/website_blog_components.xml
index 994c0311542..d4f6e59a1d7 100644
--- a/addons/website_blog/views/website_blog_components.xml
+++ b/addons/website_blog/views/website_blog_components.xml
@@ -226,7 +226,7 @@ Display a sidebar beside the post content.
<div t-if="blog_post.tag_ids" class="o_wblog_sidebar_block pb-5">
<div class="d-flex justify-content-between mb-4 border-bottom">
<h6 class="text-uppercase pb-2 font-weight-bold">Tags</h6>
- <a role="menuitem" t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{main_object._name}&amp;id=#{main_object.id}&amp;action=#{action}&amp;menu_id=#{menu or main_object.env.ref('website.menu_website_configuration').id}"
+ <a role="menuitem" t-attf-href="/web#view_type=form&amp;model=#{main_object._name}&amp;id=#{main_object.id}&amp;action=#{action}&amp;menu_id=#{menu or main_object.env.ref('website.menu_website_configuration').id}"
title='Edit in backend' id="edit-in-backend">Edit</a>
</div>
<div class="h5">
@@ -239,7 +239,7 @@ Display a sidebar beside the post content.
<h6 class="text-uppercase pb-3 mb-4 border-bottom font-weight-bold">Tags</h6>
<div class="mb-4 bg-100 py-2 px-3 border">
<h6 class="text-muted"><em>No tags definied</em></h6>
- <a role="menuitem" t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{main_object._name}&amp;id=#{main_object.id}&amp;action=#{action}&amp;menu_id=#{menu or main_object.env.ref('website.menu_website_configuration').id}"
+ <a role="menuitem" t-attf-href="/web#view_type=form&amp;model=#{main_object._name}&amp;id=#{main_object.id}&amp;action=#{action}&amp;menu_id=#{menu or main_object.env.ref('website.menu_website_configuration').id}"
title='Edit in backend' id="edit-in-backend">Add some</a>
</div>
</div>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 07727a1d399..81ca021af94 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1387,7 +1387,7 @@
<div t-if="not acquirers" class="mt-2">
<a role="button" class="btn-link"
groups="base.group_system"
- t-attf-href="/web#return_label=Website&amp;action=#{payment_action_id}">
+ t-attf-href="/web#action=#{payment_action_id}">
<i class="fa fa-arrow-right"></i> Add payment acquirers
</a>
</div>