Merge lp:~openerp-dev/openerp-web/7.0-filter-empty-fields-xmo into lp:openerp-web/7.0

[Xavier (Open ERP)]

Being able to filter on a field being empty or not empty (alt: set or not set) was added to advanced filters in 6.1, but never merged into (then) trunk and thus never in 7.0.

See https://bugs.launchpad.net/openerp-web/+bug/1013528 for ticket opened at the time

=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js	2013-01-31 13:51:25 +0000
+++ addons/web/static/src/js/search.js	2013-02-14 14:13:25 +0000
@@ -1816,6 +1816,7 @@
     template: 'SearchView.extended_search.proposition',
     events: {
         'change .searchview_extended_prop_field': 'changed',
+        'change .searchview_extended_prop_op': 'operator_changed',
         'click .searchview_extended_delete_prop': function (e) {
             e.stopPropagation();
             this.getParent().remove_proposition(this);
@@ -1847,6 +1848,17 @@
             this.select_field(_.detect(this.fields, function(x) {return x.name == nval;}));
         }
     },
+    operator_changed: function (e) {
+        var $value = self.$('.searchview_extended_prop_value');
+        switch ($(e.target).val()) {
+        case '∃':
+        case '∄':
+            $value.hide();
+            break;
+        default:
+            $value.show();
+        }
+    },
     /**
      * Selects the provided field object
      *
@@ -1875,7 +1887,7 @@
                 .text(String(operator.text))
                 .appendTo(self.$('.searchview_extended_prop_op'));
         });
-        var $value_loc = this.$('.searchview_extended_prop_value').empty();
+        var $value_loc = this.$('.searchview_extended_prop_value').show().empty();
         this.value.appendTo($value_loc);
 
     },
@@ -1883,10 +1895,27 @@
         if ( this.attrs.selected == null)
             return null;
         var field = this.attrs.selected;
-        var op = this.$('.searchview_extended_prop_op')[0];
-        var operator = op.options[op.selectedIndex];
+        var op_select = this.$('.searchview_extended_prop_op')[0];
+        var operator = op_select.options[op_select.selectedIndex];
+        var op, val, format;
+        switch (operator.value) {
+        case '∃':
+        case '∄':
+            format = _t('%(field)s %(operator)s');
+            val = false;
+            break;
+        default:
+            op = operator.value;
+            val = this.value.get_value();
+            format = _t('%(field)s %(operator)s "%(value)s"');
+        }
+        switch (operator.value) {
+        case '∃': op = '!='; break;
+        case '∄': op = '='; break;
+        }
+
         return {
-            label: _.str.sprintf(_t('%(field)s %(operator)s "%(value)s"'), {
+            label: _.str.sprintf(format, {
                 field: field.string,
                 // According to spec, HTMLOptionElement#label should return
                 // HTMLOptionElement#text when not defined/empty, but it does
@@ -1895,7 +1924,7 @@
                 // for those
                 operator: operator.label || operator.text,
                 value: this.value}),
-            value: [field.name, operator.value, this.value.get_value()]
+            value: [field.name, op, val]
         };
     }
 });
@@ -1924,7 +1953,9 @@
         {value: "ilike", text: _lt("contains")},
         {value: "not ilike", text: _lt("doesn't contain")},
         {value: "=", text: _lt("is equal to")},
-        {value: "!=", text: _lt("is not equal to")}
+        {value: "!=", text: _lt("is not equal to")},
+        {value: "∃", text: _lt("is set")},
+        {value: "∄", text: _lt("is not set")}
     ],
     get_value: function() {
         return this.$el.val();
@@ -1938,7 +1969,9 @@
         {value: ">", text: _lt("greater than")},
         {value: "<", text: _lt("less than")},
         {value: ">=", text: _lt("greater or equal than")},
-        {value: "<=", text: _lt("less or equal than")}
+        {value: "<=", text: _lt("less or equal than")},
+        {value: "∃", text: _lt("is set")},
+        {value: "∄", text: _lt("is not set")}
     ],
     /**
      * Date widgets live in view_form which is not yet loaded when this is
@@ -1972,7 +2005,9 @@
         {value: ">", text: _lt("greater than")},
         {value: "<", text: _lt("less than")},
         {value: ">=", text: _lt("greater or equal than")},
-        {value: "<=", text: _lt("less or equal than")}
+        {value: "<=", text: _lt("less or equal than")},
+        {value: "∃", text: _lt("is set")},
+        {value: "∄", text: _lt("is not set")}
     ],
     toString: function () {
         return this.$el.val();
@@ -1997,7 +2032,9 @@
         {value: ">", text: _lt("greater than")},
         {value: "<", text: _lt("less than")},
         {value: ">=", text: _lt("greater or equal than")},
-        {value: "<=", text: _lt("less or equal than")}
+        {value: "<=", text: _lt("less or equal than")},
+        {value: "∃", text: _lt("is set")},
+        {value: "∄", text: _lt("is not set")}
     ],
     toString: function () {
         return this.$el.val();
@@ -2015,7 +2052,9 @@
     template: 'SearchView.extended_search.proposition.selection',
     operators: [
         {value: "=", text: _lt("is")},
-        {value: "!=", text: _lt("is not")}
+        {value: "!=", text: _lt("is not")},
+        {value: "∃", text: _lt("is set")},
+        {value: "∄", text: _lt("is not set")}
     ],
     toString: function () {
         var select = this.$el[0];