From 05381660f75c55fda3ae8d8acd56850ff9021b62 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Thu, 19 Oct 2017 14:01:27 +0200
Subject: [PATCH] [FIX] web_widget_domain_v11: Allow to change operator

Previously, a Bootstrap dropdown was being used to choose the domain operator.

It was not working due to a problem that doesn't allow to have nested dropdowns in Odoo 10.0 search views, but possibly yes in the intermediate version where this addon was backported.

To get this working, the BS dropdown is replaced by a standard select element, so no more conflicts.
---
 .../static/src/copied-css/domain_selector.less    |  4 ----
 .../static/src/copied-js/domain_selector.js       |  4 ++--
 .../static/src/copied-xml/templates.xml           | 15 +++++----------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/web_widget_domain_v11/static/src/copied-css/domain_selector.less b/web_widget_domain_v11/static/src/copied-css/domain_selector.less
index f3917526..38435ac6 100644
--- a/web_widget_domain_v11/static/src/copied-css/domain_selector.less
+++ b/web_widget_domain_v11/static/src/copied-css/domain_selector.less
@@ -9,10 +9,6 @@
     }
 
     &.o_domain_tree {
-        .o_domain_tree_operator_caret::after {
-            .o-caret-down();
-        }
-
         > .o_domain_node_children_container {
             padding-left: @o-domain-selector-indent;
 
diff --git a/web_widget_domain_v11/static/src/copied-js/domain_selector.js b/web_widget_domain_v11/static/src/copied-js/domain_selector.js
index eccbd9d7..5c869088 100644
--- a/web_widget_domain_v11/static/src/copied-js/domain_selector.js
+++ b/web_widget_domain_v11/static/src/copied-js/domain_selector.js
@@ -84,10 +84,10 @@ var DomainNode = Widget.extend({
 var DomainTree = DomainNode.extend({
     template: "DomainTree",
     events: _.extend({}, DomainNode.prototype.events, {
-        "click .o_domain_tree_operator_selector > ul > li > a": function (e) {
+        "change .o_domain_tree_operator_selector": function (e) {
             e.preventDefault();
             e.stopPropagation();
-            this.changeOperator($(e.target).data("operator"));
+            this.changeOperator($(e.target).val());
         },
     }),
     custom_events: {
diff --git a/web_widget_domain_v11/static/src/copied-xml/templates.xml b/web_widget_domain_v11/static/src/copied-xml/templates.xml
index af5442b1..30b3b700 100644
--- a/web_widget_domain_v11/static/src/copied-xml/templates.xml
+++ b/web_widget_domain_v11/static/src/copied-xml/templates.xml
@@ -26,16 +26,11 @@
     </div>
 </t>
 <t t-name="DomainTree.OperatorSelector">
-    <div t-if="!widget.readonly" class="btn-group o_domain_tree_operator_selector">
-        <button class="btn btn-xs btn-primary o_domain_tree_operator_caret" data-toggle="dropdown">
-            <t t-if="widget.operator === '&amp;'">All</t>
-            <t t-if="widget.operator === '|'">Any</t>
-            <t t-if="widget.operator === '!'">None</t>
-        </button>
-        <ul class="dropdown-menu">
-            <li><a href="#" data-operator="&amp;">All</a></li>
-            <li><a href="#" data-operator="|">Any</a></li>
-        </ul>
+    <div t-if="!widget.readonly" class="btn-group">
+        <select class="o_domain_tree_operator_selector">
+            <option value="&amp;" t-att-selected="widget.operator === '&amp;' ? 'selected' : null">All</option>
+            <option value="|" t-att-selected="widget.operator === '|' ? 'selected' : null">Any</option>
+        </select>
     </div>
     <strong t-else="">
         <t t-if="widget.operator === '&amp;'">ALL</t>