summaryrefslogtreecommitdiff
path: root/addons/web/views
diff options
context:
space:
mode:
authorRobot Odoo <xmo+roboto@odoo.com>2019-07-31 11:01:45 +0200
committerGitHub <noreply@github.com>2019-07-31 11:01:45 +0200
commitecc760b6aebbdb5e8f0eee72f8d057a8e38b1da0 (patch)
treef74408784d850406104033e178d97cf9456628e9 /addons/web/views
parentcaf6cb929b852209e84fa23efd10f58651d18d8e (diff)
parent5ac167a85bde69460f8729bd4af3b249d05849fd (diff)
[MERGE] web, *: review crashmanager changes for backend/frontend
* gamification, website_forum, stock Fix for: https://github.com/odoo/odoo/pull/32132 Some problems with the mentioned PR had to be fixed and after some discussions, it was decided to revert back to the original crashmanager warnings for the backend. See sub-commits for details. closes odoo/odoo#35209 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web/views')
-rw-r--r--addons/web/views/webclient_templates.xml22
1 files changed, 3 insertions, 19 deletions
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index c3fc7d15479..2c9000ec0ff 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -251,6 +251,7 @@
<script type="text/javascript" src="/web/static/src/js/core/context.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/data_comparison_utils.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/misc.js"></script>
+ <script type="text/javascript" src="/web/static/src/js/services/crash_manager_service.js"></script>
<script type="text/javascript" src="/web/static/src/js/services/data_manager.js"></script>
<script type="text/javascript" src="/web/static/src/js/services/report_service.js"></script>
<script type="text/javascript" src="/web/static/src/js/services/session.js"></script>
@@ -386,6 +387,7 @@
<t t-call="web._assets_frontend_minimal_js"/>
<script type="text/javascript" src="/web/static/src/js/services/session.js"/>
+ <script type="text/javascript" src="/web/static/src/js/public/public_crash_manager.js"/>
<script type="text/javascript" src="/web/static/src/js/public/public_notification.js"/>
<script type="text/javascript" src="/web/static/src/js/public/public_root.js"/>
<script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/>
@@ -572,27 +574,9 @@
<script type="text/javascript" src="/web/static/lib/ace/mode-js.js"></script>
<script type="text/javascript">
- odoo.define('web.WebClientWithoutServices', function (require) {
- var ServiceProviderMixin = require('web.ServiceProviderMixin');
- var WebClient = require('web.WebClient');
- var WebClientWithoutServices = WebClient.extend({
- /**
- * Patch web client so that it is no longer a service provider.
- *
- * @override
- */
- init: function () {
- var originalServiceProviderMixinInit = ServiceProviderMixin.init;
- ServiceProviderMixin.init = function () {};
- this._super.apply(this, arguments);
- ServiceProviderMixin.init = originalServiceProviderMixinInit;
- },
- });
- return WebClientWithoutServices;
- });
// define the 'web.web_client' module because some other modules require it
odoo.define('web.web_client', function (require) {
- var WebClient = require('web.WebClientWithoutServices');
+ var WebClient = require('web.WebClient');
var web_client = new WebClient();
return web_client;
});