summaryrefslogtreecommitdiff
path: root/addons/web_editor/controllers
diff options
context:
space:
mode:
authorGorash <chm@odoo.com>2019-08-20 07:41:18 +0000
committerDavid Monjoie <dmo@odoo.com>2019-08-21 19:11:31 +0000
commit912996fe902c41cafa12dcfe09713ce9857f95ab (patch)
treeffb9ee4bafdf92bbbf389c38a54c327981be3f32 /addons/web_editor/controllers
parent35b61822a8b12ebbdb455495479df6f2e13db03e (diff)
[REF] web_editor, website: adapt wysiwyg to 12.0 editor
The wysiwyg abstraction layer was introduced in saas-12.2 by commit f2969923. Its goal was to provide an external interface for other modules that wanted to use the editor feature such that the editor core itself could be changed without requiring extensive changes in the other modules. This commit is adapting the wysiwyg interface to instantiate the 12.0 editor below it rather than the saas-12.2 one, thus reverting the "new editor" part of f2969923 itself. Part of PR 35677. Co-authored-by: Nicolas Bayet <nby@odoo.com> Co-authored-by: Antoine Guenet <age@odoo.com> Co-authored-by: Christophe Matthieu <chm@odoo.com> Co-authored-by: David Monjoie <dmo@odoo.com>
Diffstat (limited to 'addons/web_editor/controllers')
-rw-r--r--addons/web_editor/controllers/main.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py
index bf169fac138..bc053a743ba 100644
--- a/addons/web_editor/controllers/main.py
+++ b/addons/web_editor/controllers/main.py
@@ -147,6 +147,8 @@ class Web_Editor(http.Controller):
allSelected = False
node = ul.getprevious()
+ if node is None:
+ node = ul.getparent().getprevious()
if node is not None and node.tag == 'li':
self._update_checklist_recursive(node, allSelected, ancestors=True)