[IMP] add a 'or' operator between custom filters (web)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 64ad17e..e5fb1a2 100644 (file)
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1440,6 +1440,20 @@
   padding-right: 10px;
   margin-bottom: 5px;
 }
+.openerp .oe-search-options .dropdown-menu li.oe-filter-condition .o-or-filter {
+  display: none;
+}
+.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition {
+  margin-top: 10px;
+}
+.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition .o-or-filter {
+  display: block;
+}
+.openerp .oe-search-options .dropdown-menu .o-or-filter {
+  position: absolute;
+  left: 5px;
+  top: 5px;
+}
 .openerp .oe-search-options a {
   display: inline-block;
 }

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e04ed87..fcf05d1 100644 (file)
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1227,6 +1227,16 @@ $sheet-padding: 16px
                 padding-left: 25px
                 padding-right: 10px
                 margin-bottom: 5px
+                .o-or-filter
+                    display: none
+            li.oe-filter-condition + li.oe-filter-condition
+                margin-top: 10px
+                .o-or-filter
+                    display: block
+            .o-or-filter
+                position: absolute
+                left: 5px
+                top: 5px
         a
             display: inline-block
 

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c57ac08..4b4fcba 100644 (file)
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1687,6 +1687,7 @@
 </div>
 <t t-name="SearchView.extended_search.proposition">
     <li class="oe-filter-condition">
+        <span class="o-or-filter">or</span>
         <span>
             <select class="searchview_extended_prop_field form-control">
                 <t t-foreach="widget.attrs.fields" t-as="field">