From ca9b2db554e9fe3b93ec27eea4229ef2191838e1 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 27 Jun 2013 12:35:08 +0200 Subject: [PATCH] [FIX] webclient embed hack bzr revid: fme@openerp.com-20130627103508-ewww4270djdygdsf --- addons/website/controllers/main.py | 2 +- addons/website/static/src/js/website_editor.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 3835baafc30..11cea011bb5 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -62,7 +62,7 @@ class Website(openerp.addons.web.controllers.main.Home): return super(Website, self).index(*args, **kw) @http.route('/page/', type='http', auth="db") - def index(self, **kw): + def page(self, **kw): editable = bool(request.session._uid) try: request.session.check_security() diff --git a/addons/website/static/src/js/website_editor.js b/addons/website/static/src/js/website_editor.js index 270e28593ef..5822067bf45 100644 --- a/addons/website/static/src/js/website_editor.js +++ b/addons/website/static/src/js/website_editor.js @@ -1,16 +1,20 @@ (function() { // Init headless webclient - // TODO: check embedded mode or how to put it cleanly in a dom ready callback + // TODO: Webclient research : use iframe embedding mode + // Meanwhile, let's HACK !!! var $web = $('
').appendTo('body'); var s = new openerp.init(['web']); + s.web.WebClient.bind_hashchange = s.web.blockUI = s.web.unblockUI = function() {}; + s.web.WebClient.include({ do_push_state: function() {} }); var wc = new s.web.WebClient(); - // TODO: disable blockUI wc.appendTo($web); var instance = openerp.instances[wc.session.name]; setTimeout(function () { // HACKY HACK YUCK YUCK !! // TODO: Need modification to webclient. Webclient shall trigger an event when it's ready. + // Maybe notification shall trigger event too, so the host can bind on it and use + // it's own means in order to trigger it's own notification !? if (instance.web.notification) { instance.web.notification.$el.appendTo('body'); } else {