pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[FIX] website: moved website.xml loading to editor"

Browse Source 
This reverts commit e18a3a43e4.

website.error is used in the Javascript file it was removed from,
in website.js, line 350.

Another solution to not load this template when not needed has
to be found

opw-640822
This commit is contained in:
Denis Ledoux
2015-05-29 11:50:57 +02:00
parent 02a530b64a
commit c6d552e9c6
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.editor.js
-11
View File
@@ -939,7 +939,6 @@ define(['summernote/summernote'], function () {
website.no_editor = !!$(document.documentElement).data('editable-no-editor');
website.add_template_file('/website/static/src/xml/website.xml');
website.add_template_file('/website/static/src/xml/website.editor.xml');
website.dom_ready.done(function () {
website.ready().then(website.init_editor);
@@ -968,16 +967,6 @@ define(['summernote/summernote'], function () {
});
});
website.error = function(data, url) {
var $error = $(openerp.qweb.render('website.error_dialog', {
'title': data.data ? data.data.arguments[0] : "",
'message': data.data ? data.data.arguments[1] : data.statusText,
'backend_url': url
}));
$error.appendTo("body");
$error.modal('show');
};
website.init_editor = function () {
var editor = new website.EditorBar();
var $body = $(document.body);
addons/website/static/src/js/website.js
+12
View File
@@ -161,6 +161,16 @@
return def;
};
website.error = function(data, url) {
var $error = $(openerp.qweb.render('website.error_dialog', {
'title': data.data ? data.data.arguments[0] : "",
'message': data.data ? data.data.arguments[1] : data.statusText,
'backend_url': url
}));
$error.appendTo("body");
$error.modal('show');
};
website.form = function (url, method, params) {
var form = document.createElement('form');
form.setAttribute('action', url);
@@ -252,6 +262,8 @@
return def;
};
website.add_template_file('/website/static/src/xml/website.xml');
website.dom_ready = $.Deferred();
$(document).ready(function () {
website.dom_ready.resolve();