[IMP] Added integer and float to custom filters.

bzr revid: nicolas.vanhoren@openerp.com-20110519161835-blao1wa20xfmutsq

2 files changed, 58 insertions, 2 deletions

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 185b55e7a5f..8d22a068e39 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -911,11 +911,61 @@ openerp.base.search.ExtendedSearchProposition.Date = openerp.base.BaseWidget.ext
         });
     }
 });
+openerp.base.search.ExtendedSearchProposition.Integer = openerp.base.BaseWidget.extend({
+    template: 'SearchView.extended_search.proposition.integer',
+    identifier_prefix: 'extended-search-proposition-integer',
+    operators: [
+        {value: "=", text: "is equal to"},
+        {value: "!=", text: "is not equal to"},
+        {value: ">", text: "greater than"},
+        {value: "<", text: "less than"},
+        {value: ">=", text: "greater or equal than"},
+        {value: "<=", text: "less or equal than"}
+    ],
+    get_value: function() {
+        val = this.$element.val();
+        val2 = parseFloat(val);
+        if(val2 != 0 && !val2) {
+            return "";
+        }
+        return Math.round(val2);
+    }
+});
+openerp.base.search.ExtendedSearchProposition.Float = openerp.base.BaseWidget.extend({
+    template: 'SearchView.extended_search.proposition.float',
+    identifier_prefix: 'extended-search-proposition-float',
+    operators: [
+        {value: "=", text: "is equal to"},
+        {value: "!=", text: "is not equal to"},
+        {value: ">", text: "greater than"},
+        {value: "<", text: "less than"},
+        {value: ">=", text: "greater or equal than"},
+        {value: "<=", text: "less or equal than"}
+    ],
+    get_value: function() {
+        val = this.$element.val();
+        val2 = parseFloat(val);
+        if(val2 != 0 && !val2) {
+            return "";
+        }
+        return val2;
+    }
+});
 
 openerp.base.search.custom_filters = new openerp.base.Registry({
     'char': 'openerp.base.search.ExtendedSearchProposition.Char',
+    'text': 'openerp.base.search.ExtendedSearchProposition.Char',
+    'one2many': 'openerp.base.search.ExtendedSearchProposition.Char',
+    'many2one': 'openerp.base.search.ExtendedSearchProposition.Char',
+    'many2many': 'openerp.base.search.ExtendedSearchProposition.Char',
+    
     'datetime': 'openerp.base.search.ExtendedSearchProposition.DateTime',
-    'date': 'openerp.base.search.ExtendedSearchProposition.Date'
+    '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',
 });
 
 };
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 3cbf5c88501..b99e7adf10d 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -573,7 +573,7 @@
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
-    <input t-att-id="element_id"/>
+    <input t-att-id="element_id" class="field_char"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.datetime">
     <input t-att-id="element_id" class="field_datetime"/>
@@ -581,6 +581,12 @@
 <t t-name="SearchView.extended_search.proposition.date">
     <input t-att-id="element_id" class="field_date"/>
 </t>
+<t t-name="SearchView.extended_search.proposition.integer">
+    <input type="number" t-att-id="element_id" class="field_integer" step="1"/>
+</t>
+<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="ViewManager.sidebar">
     <div t-att-id="element_id" class="sidebar-main-div closed-sidebar">