From 5e6df4280076883c1390b36673dad8ae4b1b2913 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 15 Sep 2016 15:38:36 +0200
Subject: [FIX] web_editor: use valid bootstrap for m2o editor options

The .dropdown is in a .btn-group environment while a .btn-group can
only contain .btn or .btn-group elements.

This induced problems where the m2o options covers the full overlay
environment, preventing clicks on the customize dropdown.
---
 addons/web_editor/static/src/xml/snippets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_editor/static/src')

diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index 0b194de6af9..654c5e9fcd1 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -60,7 +60,7 @@
     <!-- t-field options -->
 
     <t t-name="web_editor.many2one.button">
-        <div class="dropdown">
+        <div class="btn-group">
             <a href="#" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact"><i class="fa fa-search"></i></a>
             <ul class="dropdown-menu contact_menu" role="menu">
                 <li><a><input href="#" type="email" placeholder="Search"/></a></li>
-- 
cgit v1.2.3


From e634a52cace081edfce324f14228ddb419af0a31 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 15 Sep 2016 16:33:19 +0200
Subject: [FIX] web_editor: mark snippets which can't be dropped in the page

The system was lost with the editor refactoring which came with saas-10
and commit bf39884a5c95c3f69e94d65e10a4d4eda3726649.
Indeed the show() method of the BuildingBlock class was removed as the
widget is now always showed but the show_blocks() method it called was
not removed (and thus was not called anymore).

As a fix, the show_blocks method is now called again, on snippets
initializations and each time a snippet is dropped or removed.
---
 addons/web_editor/static/src/js/snippets.editor.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/web_editor/static/src')

diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/snippets.editor.js
index cd03cb70f6a..51cc5a31615 100644
--- a/addons/web_editor/static/src/js/snippets.editor.js
+++ b/addons/web_editor/static/src/js/snippets.editor.js
@@ -356,6 +356,9 @@ var BuildingBlock = Widget.extend({
         });
 
         self.make_snippet_draggable(self.$snippets);
+
+        this.show_blocks();
+        this.$el.on("snippet-dropped snippet-removed", this.show_blocks.bind(this));
     },
 
     cover_target: function ($el, $target) {
@@ -1074,6 +1077,8 @@ var Editor = Class.extend({
         $(".note-control-selection").hide();
         $('.o_table_handler').remove();
 
+        this.buildingBlock.$el.trigger("snippet-removed");
+
         return false;
     },
 
-- 
cgit v1.2.3