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

This commit is contained in:
Géry Debongnie
2014-10-31 13:55:58 +01:00
parent 661d8df757
commit a3369a1f26
3 changed files with 25 additions and 0 deletions
+14
View File
@@ -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;
}
+10
View File
@@ -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
+1
View File
@@ -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">