odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] added selection in custom filters. 

bzr revid: nicolas.vanhoren@openerp.com-20110519170041-kgkio0hp6nt6u4bn
This commit is contained in:
niv-openerp 2011-05-19 19:00:41 +02:00
parent 0ce128b59e
commit a15401a722
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addons/base/static/src/js/search.js
View File

@ -830,6 +830,9 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
}
this.value = new (openerp.base.search.custom_filters.get_object(type))
(this);
if(this.value.set_field) {
this.value.set_field(field);
}
_.each(this.value.operators, function(operator) {
var option = jQuery('<option>', {value: operator.value})
.text(operator.text)
@ -951,6 +954,31 @@ openerp.base.search.ExtendedSearchProposition.Float = openerp.base.BaseWidget.ex
return val2;
}
});
openerp.base.search.ExtendedSearchProposition.Selection = openerp.base.BaseWidget.extend({
template: 'SearchView.extended_search.proposition.selection',
identifier_prefix: 'extended-search-proposition-selection',
operators: [
{value: "=", text: "is"},
{value: "!=", text: "is not"}
],
set_field: function(field) {
this.field = field;
},
get_value: function() {
return this.$element.val();
}
});
openerp.base.search.ExtendedSearchProposition.Boolean = openerp.base.BaseWidget.extend({
template: 'SearchView.extended_search.proposition.boolean',
identifier_prefix: 'extended-search-proposition-boolean',
operators: [
{value: "=", text: "is true"},
{value: "!=", text: "is false"}
],
get_value: function() {
return true;
}
});
openerp.base.search.custom_filters = new openerp.base.Registry({
'char': 'openerp.base.search.ExtendedSearchProposition.Char',
@ -963,9 +991,8 @@ openerp.base.search.custom_filters = new openerp.base.Registry({
'date': 'openerp.base.search.ExtendedSearchProposition.Date',
'integer': 'openerp.base.search.ExtendedSearchProposition.Integer',
'float': 'openerp.base.search.ExtendedSearchProposition.Float',
'selection': 'openerp.base.search.ExtendedSearchProposition.Char',
'boolean': 'openerp.base.search.ExtendedSearchProposition.Char',
'boolean': 'openerp.base.search.ExtendedSearchProposition.Boolean',
'selection': 'openerp.base.search.ExtendedSearchProposition.Selection'
});
};

9
addons/base/static/src/xml/base.xml
View File

@ -587,6 +587,15 @@
<t t-name="SearchView.extended_search.proposition.float">
<input type="number" t-att-id="element_id" class="field_float" step="0.01"/>
</t>
<t t-name="SearchView.extended_search.proposition.boolean">
</t>
<t t-name="SearchView.extended_search.proposition.selection">
<select t-att-id="element_id">
<t t-foreach="field.selection" t-as="element">
<option t-att-value="element[0]"><t t-esc="element[1]"/></option>
</t>
</select>
</t>
<t t-name="ViewManager.sidebar">
<div t-att-id="element_id" class="sidebar-main-div closed-sidebar">