Merge lp:~openerp-dev/openerp-web/7.0-bug-1095251-pan into lp:openerp-web/7.0

[Anand]

Hello,

fixed the issue of "Impossible to look for a user whose language is none".

-Here if user select blank in language then it stores as null.
-And the advanced search looks for only not null values.
-So, Added domain for the null values.
-And also added a blank option in drop-down to select blank if required.

Thanks,
PAN

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Reimplemented 6.1's generic "is set"/"is not set" operators.

review: Disapprove

Unmerged revisions

3709. By Anand on 2013-01-22

[FIX][7.0]Impossible to look for a user whose language is none (inexistant)

=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js	2013-01-14 13:51:45 +0000
+++ addons/web/static/src/js/search.js	2013-01-22 08:59:23 +0000
@@ -1745,6 +1745,13 @@
         var children = this.getChildren();
         var propositions = _.invoke(children, 'get_proposition');
         var domain = _(propositions).pluck('value');
+        
+        // if operator is '!=' then add another domain for null value
+        var field = children[0].attrs.selected.name;
+        if ((domain[domain.length - 1][1] == '!=') && (domain[domain.length - 1][2] != null )) {
+            domain[domain.length] = [field, '=', null]
+        }
+        
         for (var i = domain.length; --i;) {
             domain.unshift('|');
         }
@@ -1882,7 +1889,7 @@
         {value: "!=", text: _lt("is not equal to")}
     ],
     get_value: function() {
-        return this.$el.val();
+        return this.$el.val() || null;
     }
 });
 instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.ExtendedSearchProposition.Field.extend({
@@ -1968,6 +1975,14 @@
 });
 instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.selection',
+    init: function  (parent ,field) {
+        this._super.apply(this, arguments);
+        this.field = field;
+        this.field.selection = _(this.field.selection).chain()
+            .reject(function (v) { return v[0] === false && v[1] === ''; })
+            .unshift([null, ''])
+            .value();
+    },
     operators: [
         {value: "=", text: _lt("is")},
         {value: "!=", text: _lt("is not")}
@@ -1978,7 +1993,7 @@
         return option.label || option.text;
     },
     get_value: function() {
-        return this.$el.val();
+        return this.$el.val() || null;
     }
 });
 instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.ExtendedSearchProposition.Field.extend({