From 2bceb3a18b91b0f1d4475b073e4997d50d42fa88 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 25 Mar 2011 13:43:15 +0100 Subject: [PATCH] [FIX] IntegerField should not fail to validate when left empty. Also, until they're actually implemented relational field widgets should be Integer fields, not just fields bzr revid: xmo@openerp.com-20110325124315-k8tpt2cpwhohlljm --- addons/base/static/openerp/js/base_views.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js index e1cbef7471f..b5ba325ff81 100644 --- a/addons/base/static/openerp/js/base_views.js +++ b/addons/base/static/openerp/js/base_views.js @@ -806,6 +806,9 @@ openerp.base.search.BooleanField = openerp.base.search.Field.extend({ }); openerp.base.search.IntegerField = openerp.base.search.Field.extend({ get_value: function () { + if (!this.$element.val()) { + return null; + } var val = parseInt(this.$element.val()); var check = Number(this.$element.val()); if (isNaN(check) || val !== check) { @@ -841,24 +844,15 @@ openerp.base.search.DateField = openerp.base.search.Field.extend({ return this.$element.val(); } }); -openerp.base.search.OneToManyField = openerp.base.search.Field.extend({ +openerp.base.search.OneToManyField = openerp.base.search.IntegerField.extend({ // TODO: .relation, .context, .domain - get_value: function () { - return this.$element.val(); - } }); -openerp.base.search.ManyToOneField = openerp.base.search.Field.extend({ +openerp.base.search.ManyToOneField = openerp.base.search.IntegerField.extend({ // TODO: @widget // TODO: .relation, .selection, .context, .domain - get_value: function () { - return this.$element.val(); - } }); -openerp.base.search.ManyToManyField = openerp.base.search.Field.extend({ +openerp.base.search.ManyToManyField = openerp.base.search.IntegerField.extend({ // TODO: .related_columns (Array), .context, .domain - get_value: function () { - return this.$element.val(); - } }); openerp.base.FormView = openerp.base.Controller.extend({