diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-05-29 11:50:57 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-05-29 11:50:57 +0200 |
| commit | c6d552e9c6346d3eb04f8155f5b5c29b62064b68 (patch) | |
| tree | be90fb48231e2528a280a70d421085c5839258c4 /addons/website/static/src/js/website.js | |
| parent | 02a530b64aba00df448fc3c424e86e69fef0faed (diff) | |
Revert "[FIX] website: moved website.xml loading to editor"
This reverts commit e18a3a43e44da86a92acbe77501838ec6deb87db.
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
Diffstat (limited to 'addons/website/static/src/js/website.js')
| -rw-r--r-- | addons/website/static/src/js/website.js | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 386e0e99864..3869986e48a 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -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(); |
