From f86d1acc51d4834b5e0c86d6791680a50d520d00 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 13:35:45 +0200
Subject: [PATCH 1/8] [FIX] don't needlessly prevent events from bubbling

bzr revid: xmo@openerp.com-20110331113545-ig0kcaxzi8x2g4c1
---
 addons/base/static/src/js/search.js | 20 +++++---------------
 addons/base/static/src/xml/base.xml | 16 ++++++++++------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 52c501bcc77..fc16f9beebe 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -371,7 +371,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
         this._super(parent);
         this.fields = fields;
     },
-    add_group: function(group) {
+    add_group: function() {
         var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
         var render = group.render({});
         this.$element.find('.searchview_extended_groups_list').append(render);
@@ -382,10 +382,8 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
         var _this = this;
         openerp.base.search.add_expand_listener(this.$element);
         this.add_group();
-        this.$element.find('.searchview_extended_add_group').click(function (e) {
+        this.$element.find('.searchview_extended_add_group').click(function () {
             _this.add_group();
-            e.stopPropagation();
-            e.preventDefault();
         });
     },
     get_context: function() {
@@ -418,16 +416,12 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
         this._super();
         var _this = this;
         this.add_prop();
-        this.$element.find('.searchview_extended_add_proposition').click(function (e) {
+        this.$element.find('.searchview_extended_add_proposition').click(function () {
             _this.add_prop();
-            e.stopPropagation();
-            e.preventDefault();
         });
         var delete_btn = this.$element.find('.searchview_extended_delete_group');
         delete_btn.click(function (e) {
             _this.stop();
-            e.stopPropagation();
-            e.preventDefault();
         });
     },
     get_domain: function() {
@@ -476,16 +470,12 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
         this._super();
         this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
         var _this = this;
-        this.$element.find(".searchview_extended_prop_field").change(function(e) {
+        this.$element.find(".searchview_extended_prop_field").change(function() {
             _this.changed();
-            e.stopPropagation();
-            e.preventDefault();
         });
         var delete_btn = this.$element.find('.searchview_extended_delete_prop');
-        delete_btn.click(function (e) {
+        delete_btn.click(function () {
             _this.stop();
-            e.stopPropagation();
-            e.preventDefault();
         });
     },
     changed: function() {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 3124f5a5686..acfd78d6670 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -368,8 +368,9 @@
         <t t-set="expand" t-value="false"/>
         <t t-set="label" t-value="'Extended Filters'"/>
         <t t-set="content">
-            <div class="searchview_extended_groups_list"></div>
-            <button class="searchview_extended_add_group">Add group of conditions</button>
+            <div class="searchview_extended_groups_list"/>
+            <button class="searchview_extended_add_group"
+                    type="button">Add group of conditions</button>
         </t>
     </t>
 </t>
@@ -382,8 +383,10 @@
         </select>
         <div class="searchview_extended_propositions_list">
         </div>
-        <button class="searchview_extended_add_proposition">Add condition</button>
-        <button class="searchview_extended_delete_group">Delete this group</button>
+        <button class="searchview_extended_add_proposition"
+                type="button">Add condition</button>
+        <button class="searchview_extended_delete_group"
+                type="button">Delete this group</button>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition">
@@ -400,10 +403,11 @@
         </select>
         <span class="searchview_extended_prop_value">
         </span>
-        <button class="searchview_extended_delete_prop">Delete this condition</button>
+        <button class="searchview_extended_delete_prop"
+                type="button">Delete this condition</button>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
-    <input t-att-id="element_id"></input>
+    <input t-att-id="element_id"/>
 </t>
 </templates>

From 8bd00f390ed7c063f8d504519da8350979b25894 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 13:36:10 +0200
Subject: [PATCH 2/8] [FIX] not (ilike) is (not ilike), not (not like)

bzr revid: xmo@openerp.com-20110331113610-e0wjfbcterqmx30h
---
 addons/base/static/src/js/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index fc16f9beebe..beaa3358fc3 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -441,7 +441,7 @@ openerp.base.search.extended_filters_types = {
     char: {
         operators: [
                     {value: "ilike", text: "contains"},
-                    {value: "not like", text: "doesn't contain"},
+                    {value: "not ilike", text: "doesn't contain"},
                     {value: "=", text: "is equal to"},
                     {value: "!=", text: "is not equal to"},
                     {value: ">", text: "greater than"},

From a95012dea971bb31e008b09706cf5408940f5d35 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 14:00:10 +0200
Subject: [PATCH 3/8] [IMP] simplify templates a bit, rename set_selected to
 select_field for clarity

bzr revid: xmo@openerp.com-20110331120010-vsxxmo1ec4mtstac
---
 addons/base/static/src/js/search.js | 25 +++++++++++++++----------
 addons/base/static/src/xml/base.xml |  8 +++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index beaa3358fc3..ce3113532cc 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -461,14 +461,15 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     init: function (parent, fields) {
         this._super(parent);
         this.fields = _(fields).chain()
-            .map(function(val,key) {return {name:key, obj:val};})
-            .sortBy(function(x) {return x.obj.string;}).value();
+            .map(function(val, key) { return _.extend({}, val, {'name': key}); })
+            .sortBy(function(field) {return field.string;})
+            .value();
         this.attrs = {_: _, fields: this.fields, selected: null};
         this.value_component = null;
     },
     start: function () {
         this._super();
-        this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
+        this.select_field(this.fields.length > 0 ? this.fields[0] : null);
         var _this = this;
         this.$element.find(".searchview_extended_prop_field").change(function() {
             _this.changed();
@@ -481,26 +482,30 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     changed: function() {
         var nval = this.$element.find(".searchview_extended_prop_field").val();
         if(this.attrs.selected == null || nval != this.attrs.selected.name) {
-            this.set_selected(_.detect(this.fields, function(x) {return x.name == nval;}));
+            this.select_field(_.detect(this.fields, function(x) {return x.name == nval;}));
         }
     },
-    set_selected: function(selected) {
+    /**
+     * Selects the provided field object
+     *
+     * @param field a field descriptor object (as returned by fields_get, augmented by the field name)
+     */
+    select_field: function(field) {
         var _this = this;
         if(this.attrs.selected != null) {
             this.value_component.stop();
             this.value_component = null;
             this.$element.find('.searchview_extended_prop_op').html('');
         }
-        this.attrs.selected = selected;
-        if(selected == null) {
+        this.attrs.selected = field;
+        if(field == null) {
             return;
         }
-        var type = selected.obj.type;
+        var type = field.type;
         var extended_filters_types = openerp.base.search.extended_filters_types;
         type = type in extended_filters_types ? type : "char";
         _.each(extended_filters_types[type].operators, function(operator) {
-            var option = jQuery('<option/>')
-                .attr('value', operator.value)
+            var option = jQuery('<option>', {value: operator.value})
                 .text(operator.text)
                 .appendTo(_this.$element.find('.searchview_extended_prop_op'));
         });
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index acfd78d6670..006f8106105 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -395,14 +395,12 @@
             <t t-foreach="attrs.fields" t-as="field">
                 <option t-att="{'selected': field === attrs.selected ? 'selected' : null}"
                         t-att-value="field.name">
-                    <t t-esc="field.obj.string"/>
+                    <t t-esc="field.string"/>
                 </option>
             </t>
         </select>
-        <select class="searchview_extended_prop_op">
-        </select>
-        <span class="searchview_extended_prop_value">
-        </span>
+        <select class="searchview_extended_prop_op"/>
+        <span class="searchview_extended_prop_value"/>
         <button class="searchview_extended_delete_prop"
                 type="button">Delete this condition</button>
     </div>

From 1acde8ff13f9e2ee4d399e7fa9d5fe724aa4ddd1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 14:06:27 +0200
Subject: [PATCH 4/8] [IMP] move operators to field classes, add datetime field
 stub

bzr revid: xmo@openerp.com-20110331120627-yu28osuqd0r568i1
---
 addons/base/static/src/js/search.js | 51 ++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index ce3113532cc..ddb98debd15 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -439,19 +439,14 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
 
 openerp.base.search.extended_filters_types = {
     char: {
-        operators: [
-                    {value: "ilike", text: "contains"},
-                    {value: "not ilike", text: "doesn't contain"},
-                    {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"},
-        ],
         build_component: function(parent) {
             return new openerp.base.search.ExtendedSearchProposition.Char(parent);
         }
+    },
+    datetime: {
+        build_component: function (parent) {
+            return new openerp.base.search.ExtendedSearchProposition.DateTime(parent);
+        }
     }
 };
 
@@ -504,14 +499,16 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
         var type = field.type;
         var extended_filters_types = openerp.base.search.extended_filters_types;
         type = type in extended_filters_types ? type : "char";
-        _.each(extended_filters_types[type].operators, function(operator) {
+        
+        this.value_component = extended_filters_types[type].build_component(this);
+
+        _.each(this.value_component.operators, function(operator) {
             var option = jQuery('<option>', {value: operator.value})
                 .text(operator.text)
                 .appendTo(_this.$element.find('.searchview_extended_prop_op'));
         });
-        this.value_component = extended_filters_types[type].build_component(this);
-        var render = this.value_component.render({});
-        this.$element.find('.searchview_extended_prop_value').html(render);
+        this.$element.find('.searchview_extended_prop_value').html(
+            this.value_component.render({}));
         this.value_component.start();
     },
     get_proposition: function() {
@@ -527,7 +524,31 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
 openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.extend({
     template: 'SearchView.extended_search.proposition.char',
     identifier_prefix: 'extended-search-proposition-char',
-    
+    operators: [
+        {value: "ilike", text: "contains"},
+        {value: "not ilike", text: "doesn't contain"},
+        {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() {
+        return this.$element.val();
+    }
+});
+openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.BaseWidget.extend({
+    template: 'SearchView.extended_search.proposition.char',
+    identifier_prefix: 'extended-search-proposition-datetime',
+    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() {
         return this.$element.val();
     }

From 651e3111195216683def40161975fff32cde4d85 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 14:20:18 +0200
Subject: [PATCH 5/8] [FIX] add correct toString for KeyNotFound and
 ObjectNotFound

bzr revid: xmo@openerp.com-20110331122018-kd6oz5942pvd6bgu
---
 addons/base/static/src/js/chrome.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 7c768d8f09c..14577c9d0ab 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -71,7 +71,10 @@ openerp.base.KeyNotFound = openerp.base.NotFound.extend(
      * @param {String} key the key which could not be found
      */
     init: function (key) {
-        self.key = key;
+        this.key = key;
+    },
+    toString: function () {
+        return "The key " + this.key + " was not found";
     }
 });
 openerp.base.ObjectNotFound = openerp.base.NotFound.extend(
@@ -85,7 +88,10 @@ openerp.base.ObjectNotFound = openerp.base.NotFound.extend(
      * @param {String} path the invalid object path
      */
     init: function (path) {
-        self.path = path;
+        this.path = path;
+    },
+    toString: function () {
+        return "Could not find any object of path " + this.path;
     }
 });
 openerp.base.Registry = Class.extend(

From 1c39367b54e8920b66204319ae39cd75183723dd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 14:41:27 +0200
Subject: [PATCH 6/8] [IMP] use registry for widgets

Re-introduced 'char' fallback, but other sections (form and search) log an error and proceed blissfully unaware, I should probably do that here

bzr revid: xmo@openerp.com-20110331124127-4dfjdxv5ottlb4vo
---
 addons/base/static/src/js/search.js | 45 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index ddb98debd15..f006bed0dd2 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -437,18 +437,10 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
     }
 });
 
-openerp.base.search.extended_filters_types = {
-    char: {
-        build_component: function(parent) {
-            return new openerp.base.search.ExtendedSearchProposition.Char(parent);
-        }
-    },
-    datetime: {
-        build_component: function (parent) {
-            return new openerp.base.search.ExtendedSearchProposition.DateTime(parent);
-        }
-    }
-};
+openerp.base.search.custom_filters = new openerp.base.Registry({
+    'char': 'openerp.base.search.ExtendedSearchProposition.Char',
+    'datetime': 'openerp.base.search.ExtendedSearchProposition.DateTime'
+});
 
 openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     template: 'SearchView.extended_search.proposition',
@@ -460,7 +452,7 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
             .sortBy(function(field) {return field.string;})
             .value();
         this.attrs = {_: _, fields: this.fields, selected: null};
-        this.value_component = null;
+        this.value = null;
     },
     start: function () {
         this._super();
@@ -488,35 +480,40 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     select_field: function(field) {
         var _this = this;
         if(this.attrs.selected != null) {
-            this.value_component.stop();
-            this.value_component = null;
+            this.value.stop();
+            this.value = null;
             this.$element.find('.searchview_extended_prop_op').html('');
         }
         this.attrs.selected = field;
         if(field == null) {
             return;
         }
-        var type = field.type;
-        var extended_filters_types = openerp.base.search.extended_filters_types;
-        type = type in extended_filters_types ? type : "char";
-        
-        this.value_component = extended_filters_types[type].build_component(this);
 
-        _.each(this.value_component.operators, function(operator) {
+        var Fallback = openerp.base.search.custom_filters.get_object('char');
+        try {
+            this.value = new (openerp.base.search.custom_filters.get_object(field.type))
+                              (this);
+        } catch (e) {
+            if (! e instanceof openerp.base.KeyNotFound) {
+                throw e;
+            }
+            this.value = new Fallback(this);
+        }
+        _.each(this.value.operators, function(operator) {
             var option = jQuery('<option>', {value: operator.value})
                 .text(operator.text)
                 .appendTo(_this.$element.find('.searchview_extended_prop_op'));
         });
         this.$element.find('.searchview_extended_prop_value').html(
-            this.value_component.render({}));
-        this.value_component.start();
+            this.value.render({}));
+        this.value.start();
     },
     get_proposition: function() {
         if ( this.attrs.selected == null)
             return null;
         var field = this.attrs.selected.name;
         var op =  this.$element.find('.searchview_extended_prop_op').val();
-        var value = this.value_component.get_value();
+        var value = this.value.get_value();
         return [field, op, value];
     }
 });

From b57ca94e49c117f855225c8da7d02684245c1e6d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 15:22:26 +0200
Subject: [PATCH 7/8] [IMP] remove fallback in extended search

bzr revid: xmo@openerp.com-20110331132226-95hd2vesl2xe281o
---
 addons/base/static/src/js/search.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index f006bed0dd2..a13d8bd5223 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -489,24 +489,24 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
             return;
         }
 
-        var Fallback = openerp.base.search.custom_filters.get_object('char');
         try {
             this.value = new (openerp.base.search.custom_filters.get_object(field.type))
                               (this);
+            _.each(this.value.operators, function(operator) {
+                var option = jQuery('<option>', {value: operator.value})
+                    .text(operator.text)
+                    .appendTo(_this.$element.find('.searchview_extended_prop_op'));
+            });
+            this.$element.find('.searchview_extended_prop_value').html(
+                this.value.render({}));
+            this.value.start();
         } catch (e) {
             if (! e instanceof openerp.base.KeyNotFound) {
                 throw e;
             }
-            this.value = new Fallback(this);
+            this.attrs.selected = null;
+            this.log('Unknow field type ' + e.key);
         }
-        _.each(this.value.operators, function(operator) {
-            var option = jQuery('<option>', {value: operator.value})
-                .text(operator.text)
-                .appendTo(_this.$element.find('.searchview_extended_prop_op'));
-        });
-        this.$element.find('.searchview_extended_prop_value').html(
-            this.value.render({}));
-        this.value.start();
     },
     get_proposition: function() {
         if ( this.attrs.selected == null)

From 369278902a886cff9664e3925a8a3082bccdc94d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 15:25:52 +0200
Subject: [PATCH 8/8] [FIX] warnings, trailing commas

bzr revid: xmo@openerp.com-20110331132552-4jjb1mgn5myn1gzh
---
 addons/base/static/src/js/search.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index a13d8bd5223..5d6b175ac88 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -393,9 +393,8 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
         if(this.$element.hasClass("folded")) {
             return null;
         }
-        var domain = _.reduce(this.children,
-                function(mem, x) { return mem.concat(x.get_domain());}, []);
-        return domain;
+        return _.reduce(this.children,
+            function(mem, x) { return mem.concat(x.get_domain());}, []);
     }
 });
 
@@ -430,10 +429,9 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
         }).compact().value();
         var choice = this.$element.find(".searchview_extended_group_choice").val();
         var op = choice == "all" ? "&" : "|";
-        var domain = [].concat(choice == "none" ? ['!'] : [],
-                _.map(_.range(_.max([0,props.length - 1])), function(x) { return op; }),
-                props);
-        return domain;
+        return [].concat(choice == "none" ? ['!'] : [],
+            _.map(_.range(_.max([0,props.length - 1])), function() { return op; }),
+            props);
     }
 });
 
@@ -529,7 +527,7 @@ openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.ext
         {value: ">", text: "greater than"},
         {value: "<", text: "less than"},
         {value: ">=", text: "greater or equal than"},
-        {value: "<=", text: "less or equal than"},
+        {value: "<=", text: "less or equal than"}
     ],
     get_value: function() {
         return this.$element.val();
@@ -544,7 +542,7 @@ openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.BaseWidget
         {value: ">", text: "greater than"},
         {value: "<", text: "less than"},
         {value: ">=", text: "greater or equal than"},
-        {value: "<=", text: "less or equal than"},
+        {value: "<=", text: "less or equal than"}
     ],
     get_value: function() {
         return this.$element.val();