From 8b21ed5adee06102232fb67d23a2c449b00426fe Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 Mar 2011 16:11:20 +0100
Subject: [PATCH 01/10] [IMP] Added beginning of extended views.

bzr revid: nicolas.vanhoren@openerp.com-20110325151120-rwtxizs9rci24k1p
---
 addons/base/static/openerp/base.xml         |  8 ++++++++
 addons/base/static/openerp/js/base_views.js | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 41aca43ad0b..ce93b0e50c3 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -356,4 +356,12 @@
         </div>
     </div>
 </t>
+<t t-name="SearchView.extended_search">
+    <div class="searchview_group folded" t-att-id="element_id">
+        <a class="searchview_group_string" href="#">Extended Filters</a>
+        <div class="searchview_group_content">
+            This is the extended search view placeholder.
+        </div>
+    </div>
+</t>
 </templates>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 0047018da14..7884fd7cbd0 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -514,6 +514,9 @@ openerp.base.SearchView = openerp.base.Controller.extend({
             data.fields_view['arch'].children,
             data.fields_view.fields);
 
+        // for extended search view
+        lines.push([new openerp.base.search.ExtendedSearch(this)]);
+        
         var render = QWeb.render("SearchView", {
             'view': data.fields_view['arch'],
             'lines': lines,
@@ -739,6 +742,22 @@ openerp.base.search.Group = openerp.base.search.Widget.extend({
         });
     }
 });
+openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
+    template: 'SearchView.extended_search',
+    init: function (view) {
+	    this._super(view);
+        this.make_id('extended-search');
+	},
+    start: function () {
+        this._super();
+        var $root = this.$element;
+        $root.find('a.searchview_group_string').click(function (e) {
+            $root.toggleClass('folded expanded');
+            e.stopPropagation();
+            e.preventDefault();
+        });
+	}
+});
 openerp.base.search.Input = openerp.base.search.Widget.extend({
     init: function (view) {
         this._super(view);

From cf4fda9764694592adbddadbf4e32d9d3d00a06d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 28 Mar 2011 09:37:22 +0200
Subject: [PATCH 02/10] [IMP] Modified search view to factorise expanding
 functionality.

bzr revid: nicolas.vanhoren@openerp.com-20110328073722-stytrmyog74ikar5
---
 addons/base/static/openerp/base.xml         | 32 ++++++++++++++-------
 addons/base/static/openerp/js/base_views.js | 20 ++++++-------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index ce93b0e50c3..549fc91471f 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -345,23 +345,33 @@
         <t t-if="filters.length" t-raw="filters.render(defaults)"/>
     </div>
 </t>
-<t t-name="SearchView.group">
-    <div t-att-class="'searchview_group ' + (attrs.expand == '0' ? 'folded' : 'expanded')"
+<t t-name="SearchView.util.expand">
+	<div t-att-class="'searchview_group ' + (expand == '0' ? 'folded' : 'expanded')"
          t-att-id="element_id">
-        <a t-if="attrs.string" class="searchview_group_string" href="#">
-            <t t-esc="attrs.string"/>
+        <a t-if="label" class="searchview_group_string" href="#">
+            <t t-esc="label"/>
         </a>
         <div class="searchview_group_content">
-            <t t-call="SearchView.render_lines"/>
+            <t t-raw="content"/>
         </div>
     </div>
 </t>
+<t t-name="SearchView.group">
+	<t t-call="SearchView.util.expand">
+		<t t-set="expand" t-value="attrs.expand"/>
+		<t t-set="label" t-value="attrs.string"/>
+		<t t-set="content">
+			<t t-call="SearchView.render_lines"/>
+		</t>
+	</t>
+</t>
 <t t-name="SearchView.extended_search">
-    <div class="searchview_group folded" t-att-id="element_id">
-        <a class="searchview_group_string" href="#">Extended Filters</a>
-        <div class="searchview_group_content">
-            This is the extended search view placeholder.
-        </div>
-    </div>
+	<t t-call="SearchView.util.expand">
+		<t t-set="expand" t-value="false"/>
+		<t t-set="label" t-value="'Extended Filters'"/>
+		<t t-set="content">
+			This is the extended search view placeholder.
+		</t>
+	</t>
 </t>
 </templates>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 7884fd7cbd0..21415fff71e 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -717,6 +717,13 @@ openerp.base.search.FilterGroup = openerp.base.search.Widget.extend({
         });
     }
 });
+add_expand_listener = function($root) {
+	$root.find('a.searchview_group_string').click(function (e) {
+        $root.toggleClass('folded expanded');
+        e.stopPropagation();
+        e.preventDefault();
+    });
+};
 openerp.base.search.Group = openerp.base.search.Widget.extend({
     template: 'SearchView.group',
     // TODO: contain stuff
@@ -734,12 +741,7 @@ openerp.base.search.Group = openerp.base.search.Widget.extend({
             .chain()
             .flatten()
             .each(function (widget) { widget.start(); });
-        var $root = this.$element;
-        $root.find('a.searchview_group_string').click(function (e) {
-            $root.toggleClass('folded expanded');
-            e.stopPropagation();
-            e.preventDefault();
-        });
+        add_expand_listener(this.$element);
     }
 });
 openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
@@ -751,11 +753,7 @@ openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
     start: function () {
         this._super();
         var $root = this.$element;
-        $root.find('a.searchview_group_string').click(function (e) {
-            $root.toggleClass('folded expanded');
-            e.stopPropagation();
-            e.preventDefault();
-        });
+        add_expand_listener(this.$element);
 	}
 });
 openerp.base.search.Input = openerp.base.search.Widget.extend({

From 5b477c14644f261766c095a72c3570a344c5b04f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 28 Mar 2011 14:42:47 +0200
Subject: [PATCH 03/10] [IMP] Extended filters wip.

bzr revid: nicolas.vanhoren@openerp.com-20110328124247-mb723pentlpimb1z
---
 addons/base/static/openerp/base.html        |  1 +
 addons/base/static/openerp/base.xml         | 18 +++++-
 addons/base/static/openerp/js/base_views.js | 64 ++++++++++++++++++++-
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/openerp/base.html b/addons/base/static/openerp/base.html
index 8c73d2adddc..d62bc1f1af6 100644
--- a/addons/base/static/openerp/base.html
+++ b/addons/base/static/openerp/base.html
@@ -13,6 +13,7 @@
     <script type="text/javascript" src="/base/static/LABjs/LAB.js"></script>
     <script>
         $LAB
+        .setOptions({UsePreloading:false})
         .script('/base/static/openerp/js/base.js')
         .script('/base/static/qweb/qweb.js')
         .script('/base/static/underscore/underscore.js')
diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 549fc91471f..8da00d4c4ef 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -370,8 +370,24 @@
 		<t t-set="expand" t-value="false"/>
 		<t t-set="label" t-value="'Extended Filters'"/>
 		<t t-set="content">
-			This is the extended search view placeholder.
+			<div class="searchview_extended_groups_list"></div>
+			<button class="searchview_extended_add_group">Add group of conditions</button>
 		</t>
 	</t>
 </t>
+<t t-name="SearchView.extended_search.group">
+	<div t-att-id="element_id">
+		<select>
+			<option value="all">All</option>
+			<option value="any">Any</option>
+			<option value="none">None</option>
+		</select>
+		<div class="searchview_extended_propositions_list">
+		</div>
+		<button class="searchview_extended_add_proposition">Add Proposition</button>
+	</div>
+</t>
+<t t-name="SearchView.extended_search.proposition">
+	Placeholder
+</t>
 </templates>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 21415fff71e..75456027a7e 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -515,7 +515,7 @@ openerp.base.SearchView = openerp.base.Controller.extend({
             data.fields_view.fields);
 
         // for extended search view
-        lines.push([new openerp.base.search.ExtendedSearch(this)]);
+        lines.push([new openerp.base.search.ExtendedSearch(this, data.fields_view.fields)]);
         
         var render = QWeb.render("SearchView", {
             'view': data.fields_view['arch'],
@@ -746,14 +746,72 @@ openerp.base.search.Group = openerp.base.search.Widget.extend({
 });
 openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
     template: 'SearchView.extended_search',
-    init: function (view) {
+    init: function (view, fields) {
 	    this._super(view);
         this.make_id('extended-search');
+        this.fields = fields;
+        this.groups_list = [];
+	},
+	add_group: function(group) {
+    	var group = new openerp.base.search.ExtendedSearchGroup(this.view, this.fields);
+		var $root = this.$element;
+		this.groups_list.push(group);
+        var render = group.render({});
+        var groups_div = $root.find('.searchview_extended_groups_list');
+        groups_div.html(groups_div.html() + render);
+        group.start();
 	},
     start: function () {
         this._super();
         var $root = this.$element;
-        add_expand_listener(this.$element);
+        var $this = this;
+        add_expand_listener($root);
+        this.add_group();
+        $root.find('.searchview_extended_add_group').click(function (e) {
+            $this.add_group()
+            e.stopPropagation();
+            e.preventDefault();
+        });
+	}
+});
+openerp.base.search.ExtendedSearchGroup = openerp.base.search.Widget.extend({
+    template: 'SearchView.extended_search.group',
+    init: function (view, fields) {
+	    this._super(view);
+	    this.make_id('extended-search-group');
+	    this.attrs = {fields: fields};
+	    this.propositions_list = [];
+	},
+	add_prop: function() {
+        var $root = this.$element;
+		var prop = new openerp.base.search.ExtendedSearchProposition(this.view, this.fields);
+        this.propositions_list.push(prop);
+        var render = prop.render({});
+        var propositions_div = $root.find('.searchview_extended_propositions_list');
+        propositions_div.html(propositions_div.html() + render);
+        prop.start();
+	},
+    start: function () {
+        this._super();
+        var $root = this.$element;
+        var $this = this;
+        this.add_prop();
+        $root.find('.searchview_extended_add_proposition').click(function (e) {
+        	$this.add_prop();
+            e.stopPropagation();
+            e.preventDefault();
+        });
+	}
+});
+openerp.base.search.ExtendedSearchProposition = openerp.base.search.Widget.extend({
+    template: 'SearchView.extended_search.proposition',
+    init: function (view, fields) {
+	    this._super(view);
+	    this.make_id('extended-search-proposition');
+	    this.attrs = {fields: fields};
+	},
+    start: function () {
+        this._super();
 	}
 });
 openerp.base.search.Input = openerp.base.search.Widget.extend({

From 1e908843eefe5db03e4d64ce7a639deac19a74c3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 28 Mar 2011 18:49:45 +0200
Subject: [PATCH 04/10] [IMP] Extended filters wip.

bzr revid: nicolas.vanhoren@openerp.com-20110328164945-xdsmfq233cxlxggy
---
 addons/base/static/openerp/base.xml         |  22 +++-
 addons/base/static/openerp/js/base_views.js | 118 ++++++++++++++++++--
 addons/base/static/qweb/qweb.js             |   4 +-
 3 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 8da00d4c4ef..0ea22201b2b 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -384,10 +384,28 @@
 		</select>
 		<div class="searchview_extended_propositions_list">
 		</div>
-		<button class="searchview_extended_add_proposition">Add Proposition</button>
+		<button class="searchview_extended_add_proposition">Add condition</button>
+		<button class="searchview_extended_delete_group">Delete this group</button>
 	</div>
 </t>
 <t t-name="SearchView.extended_search.proposition">
-	Placeholder
+	<div t-att-id="element_id">
+		<select class="searchview_extended_prop_field">
+			<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"/>
+				</option>
+			</t>
+		</select>
+		<select class="searchview_extended_prop_op">
+		</select>
+		<span class="searchview_extended_prop_value">
+		</span>
+		<button class="searchview_extended_delete_prop">Delete this condition</button>
+	</div>
+</t>
+<t t-name="SearchView.extended_search.proposition.char">
+	<input t-att-id="element_id"></input>
 </t>
 </templates>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 75456027a7e..4b21ef5da85 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -695,6 +695,7 @@ openerp.base.search.Widget = openerp.base.Controller.extend({
      */
     stop: function () {
         delete this.view;
+        this.$element.remove();
         this._super();
     },
     render: function (defaults) {
@@ -753,7 +754,7 @@ openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
         this.groups_list = [];
 	},
 	add_group: function(group) {
-    	var group = new openerp.base.search.ExtendedSearchGroup(this.view, this.fields);
+    	var group = new openerp.base.search.ExtendedSearchGroup(this.view, this, this.fields);
 		var $root = this.$element;
 		this.groups_list.push(group);
         var render = group.render({});
@@ -761,6 +762,16 @@ openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
         groups_div.html(groups_div.html() + render);
         group.start();
 	},
+	remove: function(group) {
+		this.groups_list = _.select(this.groups_list, function(x) {return ! x === group});
+		group.stop();
+	},
+	stop: function() {
+    	_.each(this.groups_list, function(el) {
+    		el.stop();
+    	});
+    	this._super();
+	},
     start: function () {
         this._super();
         var $root = this.$element;
@@ -768,7 +779,7 @@ openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
         add_expand_listener($root);
         this.add_group();
         $root.find('.searchview_extended_add_group').click(function (e) {
-            $this.add_group()
+            $this.add_group();
             e.stopPropagation();
             e.preventDefault();
         });
@@ -776,21 +787,32 @@ openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
 });
 openerp.base.search.ExtendedSearchGroup = openerp.base.search.Widget.extend({
     template: 'SearchView.extended_search.group',
-    init: function (view, fields) {
+    init: function (view, parent, fields) {
 	    this._super(view);
+	    this.parent = parent;
 	    this.make_id('extended-search-group');
-	    this.attrs = {fields: fields};
+	    this.fields = fields;
 	    this.propositions_list = [];
 	},
 	add_prop: function() {
         var $root = this.$element;
-		var prop = new openerp.base.search.ExtendedSearchProposition(this.view, this.fields);
+		var prop = new openerp.base.search.ExtendedSearchProposition(this.view, this, this.fields);
         this.propositions_list.push(prop);
         var render = prop.render({});
         var propositions_div = $root.find('.searchview_extended_propositions_list');
         propositions_div.html(propositions_div.html() + render);
         prop.start();
 	},
+	stop: function() {
+    	_.each(this.propositions_list, function(el) {
+    		el.stop();
+    	});
+    	this._super();
+	},
+	remove: function(prop) {
+		this.propositions_list = _.select(this.propositions_list, function(x) {return ! x === prop});
+		prop.stop();
+	},
     start: function () {
         this._super();
         var $root = this.$element;
@@ -801,14 +823,96 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.search.Widget.extend({
             e.stopPropagation();
             e.preventDefault();
         });
+        $root.find('.searchview_extended_delete_group').click(function (e) {
+        	$this.parent.remove($this);
+        });
 	}
 });
+extended_filters_types = {
+	char: {
+		operators: [
+		            {value: "=", text: "="},
+		            {value: "!=", text: "!="},
+		            {value: "<", text: "<"},
+		            {value: "<=", text: "<="},
+		            {value: ">", text: ">"},
+		            {value: ">=", text: ">="},
+		            {value: "like", text: "contains"},
+		            {value: "not like", text: "does not contain"},
+		],
+		build_component: function(view) {
+			return new openerp.base.search.ExtendedSearchProposition.Char(view);
+		},
+	}
+}
 openerp.base.search.ExtendedSearchProposition = openerp.base.search.Widget.extend({
     template: 'SearchView.extended_search.proposition',
-    init: function (view, fields) {
+    init: function (view, parent, fields) {
 	    this._super(view);
+	    this.parent = parent;
 	    this.make_id('extended-search-proposition');
-	    this.attrs = {fields: fields};
+	    this.fields = _(fields).chain()
+	    	.map(function(key,val) {return {name:val, obj:key};})
+	    	.sortBy(function(x) {return x.name;}).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 = this;
+	    this.$element.find(".searchview_extended_prop_field").change(function(e) {
+	    	$this.changed();
+            e.stopPropagation();
+            e.preventDefault();
+	    });
+	    this.$element.find('.searchview_extended_delete_prop').click(function (e) {
+        	$this.parent.remove($this);
+        });
+	},
+	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}));
+		}
+	},
+	stop: function() {
+    	if(this.value_component != null) {
+    		this.value_component.stop();
+		};
+    	this._super();
+	},
+	set_selected: function(selected) {
+		var $root = this.$element;
+		var tmp = $root.find('.searchview_extended_prop_op');
+		if(this.attrs.selected != null) {
+			this.value_component.stop();
+			this.value_component = null;
+			$root.find('.searchview_extended_prop_op').html('');
+		}
+		this.attrs.selected = selected;
+		if(selected == null) {
+			return;
+		}
+		var type = selected.obj.type;
+		type = type in extended_filters_types ? type : "char";
+		_.each(extended_filters_types[type].operators, function(operator) {
+			option = jQuery('<option/>');
+			option.attr('value', operator.value);
+			option.text(operator.text);
+			option.appendTo($root.find('.searchview_extended_prop_op'));
+		});
+		this.value_component = extended_filters_types[type].build_component(this.view);
+		var render = this.value_component.render({});
+		$root.find('.searchview_extended_prop_value').html(render);
+		this.value_component.start();
+	},
+});
+openerp.base.search.ExtendedSearchProposition.Char = openerp.base.search.Widget.extend({
+    template: 'SearchView.extended_search.proposition.char',
+    init: function (view) {
+	    this._super(view);
+	    this.make_id('extended-search-proposition-char');
 	},
     start: function () {
         this._super();
diff --git a/addons/base/static/qweb/qweb.js b/addons/base/static/qweb/qweb.js
index c12af4e0f45..cb117a2a756 100644
--- a/addons/base/static/qweb/qweb.js
+++ b/addons/base/static/qweb/qweb.js
@@ -182,7 +182,9 @@ var QWeb = {
                     g_att[o[0]] = new String(o[1]);
                 } else if (o.constructor == Object) {
                     for (var i in o) {
-                        g_att[i] = new String(o[i]);
+                    	if(o[i]!=null) {
+                    		g_att[i] = new String(o[i]);
+                    	}
                     }
                 }
             }

From 7af4d63d0ca6725aa8c0266eb55313072aba6a46 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 29 Mar 2011 11:10:01 +0200
Subject: [PATCH 05/10] [IMP] Prototype base class for widgets.

bzr revid: nicolas.vanhoren@openerp.com-20110329091001-u76p5psmpi70me3t
---
 addons/base/static/openerp/js/base_views.js | 104 ++++++++++++++++++--
 1 file changed, 96 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 4b21ef5da85..c0968401a69 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -831,14 +831,14 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.search.Widget.extend({
 extended_filters_types = {
 	char: {
 		operators: [
-		            {value: "=", text: "="},
-		            {value: "!=", text: "!="},
-		            {value: "<", text: "<"},
-		            {value: "<=", text: "<="},
-		            {value: ">", text: ">"},
-		            {value: ">=", text: ">="},
-		            {value: "like", text: "contains"},
-		            {value: "not like", text: "does not contain"},
+		            {value: "ilike", text: "contains"},
+		            {value: "not like", 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(view) {
 			return new openerp.base.search.ExtendedSearchProposition.Char(view);
@@ -1246,6 +1246,94 @@ openerp.base.ListView = openerp.base.Controller.extend({
 openerp.base.TreeView = openerp.base.Controller.extend({
 });
 
+/**
+ * Base class for widgets. Handle rendering (based on a QWeb template), identifier
+ * generation, parenting and destruction of the widget.
+ */
+openerp.base.search.BaseWidget = openerp.base.Controller.extend({
+	/**
+	 * The name of the QWeb template that will be used for rendering. Must be redifined
+	 * in subclasses or the render() method can not be used.
+	 * 
+	 * @type string
+	 */
+    template: null,
+    /**
+     * The prefix used to generate an id automatically. Should be redifined in subclasses.
+     * If it is not defined, the make_id() method must be explicitly called.
+     * 
+     * @type string
+     */
+    identifier_prefix: null,
+    /**
+     * Contructor.
+     * 
+     * @params {openerp.base.search.BaseWidget} parent The parent widget.
+     */
+    init: function (parent) {
+		this.children = [];
+        this.parent = parent;
+        if(parent != null) {
+        	parent.children.push(this);
+        }
+        if(this.identifier_prefix != null) {
+        	this.make_id(this.identifier_prefix);
+        }
+    },
+    /**
+     * Sets and returns a globally unique identifier for the widget.
+     *
+     * If a prefix is appended, the identifier will be appended to it.
+     *
+     * @params sections prefix sections, empty/falsy sections will be removed
+     */
+    make_id: function () {
+        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        return this.element_id;
+    },
+    /**
+     * "Starts" the widgets. Called at the end of the rendering, this allows
+     * to get a jQuery object referring to the DOM ($element attribute).
+     */
+    start: function () {
+        this._super();
+        if (this.element_id) {
+            this.$element = $(document.getElementById(
+                this.element_id));
+        }
+    },
+    /**
+     * "Stops" the widgets. Called when the view destroys itself, this
+     * lets the widgets clean up after themselves.
+     */
+    stop: function () {
+    	var tmp_children = this.children;
+    	this.children = [];
+    	_.each(tmp_children, function(x) {
+    		x.stop();
+    	});
+    	if(this.$element != null) {
+    		this.$element.remove();
+    	}
+    	if(this.parent != null) {
+    		var _this = this;
+    		parent.children = _.reject(parent.children, function(x) { return x === _this;});
+            this.parent = null;
+    	}
+        this._super();
+    },
+    /**
+     * Render the widget. This.template must be defined.
+     * The content of the current object is passed as context to the template.
+     * 
+     * @param {object} additional Additional context arguments to pass to the template.
+     */
+    render: function (additional) {
+        return QWeb.render(this.template, _.extend({}, this,
+        		additional != null ? additional : {}));
+    }
+});
+
 openerp.base.Widget = openerp.base.Controller.extend({
     // TODO Change this to init: function(view, node) { and use view.session and a new element_id for the super
     // it means that widgets are special controllers

From 06c6a18d10cb082c4b1142dd718ee5f7d07b4308 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 29 Mar 2011 15:18:54 +0200
Subject: [PATCH 06/10] [IMP] Extended filters wip. Now generates domains.

bzr revid: nicolas.vanhoren@openerp.com-20110329131854-m2d2fjwm3d566su2
---
 addons/base/static/openerp/base.xml         |  10 +-
 addons/base/static/openerp/js/base_views.js | 306 +++++++++++---------
 2 files changed, 172 insertions(+), 144 deletions(-)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 0ea22201b2b..304c1c1b4c9 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -372,12 +372,17 @@
 		<t t-set="content">
 			<div class="searchview_extended_groups_list"></div>
 			<button class="searchview_extended_add_group">Add group of conditions</button>
+			<!-- TODO: remove test -->
+			<div>
+			<button class="test_get_domain">Get Domain</button>
+			<span class="test_domain"></span>
+			</div>
 		</t>
 	</t>
 </t>
 <t t-name="SearchView.extended_search.group">
 	<div t-att-id="element_id">
-		<select>
+		<select class="searchview_extended_group_choice">
 			<option value="all">All</option>
 			<option value="any">Any</option>
 			<option value="none">None</option>
@@ -406,6 +411,7 @@
 	</div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
-	<input t-att-id="element_id"></input>
+	<!-- TODO: remove test -->
+	<input t-att-id="element_id" t-att-value="element_id" style="width: 300px;"></input>
 </t>
 </templates>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index c0968401a69..bfff8bed26b 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -393,6 +393,94 @@ openerp.base.DataRecord =  openerp.base.Controller.extend({
     }
 });
 
+/**
+ * Base class for widgets. Handle rendering (based on a QWeb template), identifier
+ * generation, parenting and destruction of the widget.
+ */
+openerp.base.BaseWidget = openerp.base.Controller.extend({
+	/**
+	 * The name of the QWeb template that will be used for rendering. Must be redifined
+	 * in subclasses or the render() method can not be used.
+	 * 
+	 * @type string
+	 */
+    template: null,
+    /**
+     * The prefix used to generate an id automatically. Should be redifined in subclasses.
+     * If it is not defined, the make_id() method must be explicitly called.
+     * 
+     * @type string
+     */
+    identifier_prefix: null,
+    /**
+     * Contructor.
+     * 
+     * @params {openerp.base.search.BaseWidget} parent The parent widget.
+     */
+    init: function (parent) {
+		this.children = [];
+        this.parent = parent;
+        if(parent != null) {
+        	parent.children.push(this);
+        }
+        if(this.identifier_prefix != null) {
+        	this.make_id(this.identifier_prefix);
+        }
+    },
+    /**
+     * Sets and returns a globally unique identifier for the widget.
+     *
+     * If a prefix is appended, the identifier will be appended to it.
+     *
+     * @params sections prefix sections, empty/falsy sections will be removed
+     */
+    make_id: function () {
+        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        return this.element_id;
+    },
+    /**
+     * "Starts" the widgets. Called at the end of the rendering, this allows
+     * to get a jQuery object referring to the DOM ($element attribute).
+     */
+    start: function () {
+        this._super();
+        if (this.element_id) {
+            this.$element = $(document.getElementById(
+                this.element_id));
+        }
+    },
+    /**
+     * "Stops" the widgets. Called when the view destroys itself, this
+     * lets the widgets clean up after themselves.
+     */
+    stop: function () {
+    	var tmp_children = this.children;
+    	this.children = [];
+    	_.each(tmp_children, function(x) {
+    		x.stop();
+    	});
+    	if(this.$element != null) {
+    		this.$element.remove();
+    	}
+    	if(this.parent != null) {
+    		var _this = this;
+    		this.parent.children = _.reject(this.parent.children, function(x) { return x === _this;});
+            this.parent = null;
+    	}
+        this._super();
+    },
+    /**
+     * Render the widget. This.template must be defined.
+     * The content of the current object is passed as context to the template.
+     * 
+     * @param {object} additional Additional context arguments to pass to the template.
+     */
+    render: function (additional) {
+        return QWeb.render(this.template, _.extend({}, this,
+        		additional != null ? additional : {}));
+    }
+});
+
 openerp.base.SearchView = openerp.base.Controller.extend({
     init: function(session, element_id, dataset, view_id, defaults) {
         this._super(session, element_id);
@@ -515,7 +603,7 @@ openerp.base.SearchView = openerp.base.Controller.extend({
             data.fields_view.fields);
 
         // for extended search view
-        lines.push([new openerp.base.search.ExtendedSearch(this, data.fields_view.fields)]);
+        lines.push([new openerp.base.search.ExtendedSearch(null, data.fields_view.fields)]);
         
         var render = QWeb.render("SearchView", {
             'view': data.fields_view['arch'],
@@ -695,7 +783,6 @@ openerp.base.search.Widget = openerp.base.Controller.extend({
      */
     stop: function () {
         delete this.view;
-        this.$element.remove();
         this._super();
     },
     render: function (defaults) {
@@ -745,33 +832,28 @@ openerp.base.search.Group = openerp.base.search.Widget.extend({
         add_expand_listener(this.$element);
     }
 });
-openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
+
+openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
     template: 'SearchView.extended_search',
-    init: function (view, fields) {
-	    this._super(view);
-        this.make_id('extended-search');
+    identifier_prefix: 'extended-search',
+    init: function (parent, fields) {
+	    this._super(parent);
         this.fields = fields;
         this.groups_list = [];
 	},
 	add_group: function(group) {
-    	var group = new openerp.base.search.ExtendedSearchGroup(this.view, this, this.fields);
+    	var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
 		var $root = this.$element;
 		this.groups_list.push(group);
         var render = group.render({});
         var groups_div = $root.find('.searchview_extended_groups_list');
-        groups_div.html(groups_div.html() + render);
+        groups_div.append(render);
         group.start();
 	},
 	remove: function(group) {
 		this.groups_list = _.select(this.groups_list, function(x) {return ! x === group});
 		group.stop();
 	},
-	stop: function() {
-    	_.each(this.groups_list, function(el) {
-    		el.stop();
-    	});
-    	this._super();
-	},
     start: function () {
         this._super();
         var $root = this.$element;
@@ -783,34 +865,39 @@ openerp.base.search.ExtendedSearch = openerp.base.search.Widget.extend({
             e.stopPropagation();
             e.preventDefault();
         });
+        // TODO: remove test
+        $root.find('.test_get_domain').click(function (e) {
+        	$root.find('.test_domain').text(JSON.stringify($this.get_domain()));
+            e.stopPropagation();
+            e.preventDefault();
+        });
+	},
+	get_domain: function() {
+		var domain = _.reduce(this.groups_list,
+				function(mem, x) { return mem.concat(x.get_domain());}, []);
+		return domain;
 	}
 });
-openerp.base.search.ExtendedSearchGroup = openerp.base.search.Widget.extend({
+
+openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
     template: 'SearchView.extended_search.group',
-    init: function (view, parent, fields) {
-	    this._super(view);
-	    this.parent = parent;
-	    this.make_id('extended-search-group');
+    identifier_prefix: 'extended-search-group',
+    init: function (parent, fields) {
+	    this._super(parent);
 	    this.fields = fields;
 	    this.propositions_list = [];
 	},
 	add_prop: function() {
         var $root = this.$element;
-		var prop = new openerp.base.search.ExtendedSearchProposition(this.view, this, this.fields);
+		var prop = new openerp.base.search.ExtendedSearchProposition(this, this.fields);
         this.propositions_list.push(prop);
         var render = prop.render({});
         var propositions_div = $root.find('.searchview_extended_propositions_list');
-        propositions_div.html(propositions_div.html() + render);
+        propositions_div.append(render);
         prop.start();
 	},
-	stop: function() {
-    	_.each(this.propositions_list, function(el) {
-    		el.stop();
-    	});
-    	this._super();
-	},
 	remove: function(prop) {
-		this.propositions_list = _.select(this.propositions_list, function(x) {return ! x === prop});
+		this.propositions_list = _.reject(this.propositions_list, function(x) {return x === prop});
 		prop.stop();
 	},
     start: function () {
@@ -823,11 +910,27 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.search.Widget.extend({
             e.stopPropagation();
             e.preventDefault();
         });
-        $root.find('.searchview_extended_delete_group').click(function (e) {
+        var delete_btn = $root.find('.searchview_extended_delete_group');
+        delete_btn.click(function (e) {
         	$this.parent.remove($this);
+        	console.log(delete_btn);
+            e.stopPropagation();
+            e.preventDefault();
         });
+	},
+	get_domain: function() {
+		var props = _(this.propositions_list).chain().map(function(x) {
+			return x.get_proposition();
+		}).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;
 	}
 });
+
 extended_filters_types = {
 	char: {
 		operators: [
@@ -840,20 +943,20 @@ extended_filters_types = {
 		            {value: ">=", text: "greater or equal than"},
 		            {value: "<=", text: "less or equal than"},
 		],
-		build_component: function(view) {
-			return new openerp.base.search.ExtendedSearchProposition.Char(view);
+		build_component: function(parent) {
+			return new openerp.base.search.ExtendedSearchProposition.Char(parent);
 		},
 	}
-}
-openerp.base.search.ExtendedSearchProposition = openerp.base.search.Widget.extend({
+};
+
+openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     template: 'SearchView.extended_search.proposition',
-    init: function (view, parent, fields) {
-	    this._super(view);
-	    this.parent = parent;
-	    this.make_id('extended-search-proposition');
+    identifier_prefix: 'extended-search-proposition',
+    init: function (parent, fields) {
+	    this._super(parent);
 	    this.fields = _(fields).chain()
-	    	.map(function(key,val) {return {name:val, obj:key};})
-	    	.sortBy(function(x) {return x.name;}).value();
+	    	.map(function(val,key) {return {name:key, obj:val};})
+	    	.sortBy(function(x) {return x.obj.string;}).value();
 	    this.attrs = {_: _, fields: this.fields, selected: null};
 	    this.value_component = null;
 	},
@@ -868,6 +971,8 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.search.Widget.exten
 	    });
 	    this.$element.find('.searchview_extended_delete_prop').click(function (e) {
         	$this.parent.remove($this);
+            e.stopPropagation();
+            e.preventDefault();
         });
 	},
 	changed: function() {
@@ -876,12 +981,6 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.search.Widget.exten
 			this.set_selected(_.detect(this.fields, function(x) {return x.name == nval}));
 		}
 	},
-	stop: function() {
-    	if(this.value_component != null) {
-    		this.value_component.stop();
-		};
-    	this._super();
-	},
 	set_selected: function(selected) {
 		var $root = this.$element;
 		var tmp = $root.find('.searchview_extended_prop_op');
@@ -902,22 +1001,31 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.search.Widget.exten
 			option.text(operator.text);
 			option.appendTo($root.find('.searchview_extended_prop_op'));
 		});
-		this.value_component = extended_filters_types[type].build_component(this.view);
+		this.value_component = extended_filters_types[type].build_component(this);
 		var render = this.value_component.render({});
 		$root.find('.searchview_extended_prop_value').html(render);
 		this.value_component.start();
 	},
-});
-openerp.base.search.ExtendedSearchProposition.Char = openerp.base.search.Widget.extend({
-    template: 'SearchView.extended_search.proposition.char',
-    init: function (view) {
-	    this._super(view);
-	    this.make_id('extended-search-proposition-char');
-	},
-    start: function () {
-        this._super();
+	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();
+		return [field, op, value];
 	}
 });
+
+openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.extend({
+    template: 'SearchView.extended_search.proposition.char',
+    identifier_prefix: 'extended-search-proposition-char',
+    
+    get_value: function() {
+		var val = this.$element.val();
+		return val;
+	}
+});
+
 openerp.base.search.Input = openerp.base.search.Widget.extend({
     init: function (view) {
         this._super(view);
@@ -1246,93 +1354,7 @@ openerp.base.ListView = openerp.base.Controller.extend({
 openerp.base.TreeView = openerp.base.Controller.extend({
 });
 
-/**
- * Base class for widgets. Handle rendering (based on a QWeb template), identifier
- * generation, parenting and destruction of the widget.
- */
-openerp.base.search.BaseWidget = openerp.base.Controller.extend({
-	/**
-	 * The name of the QWeb template that will be used for rendering. Must be redifined
-	 * in subclasses or the render() method can not be used.
-	 * 
-	 * @type string
-	 */
-    template: null,
-    /**
-     * The prefix used to generate an id automatically. Should be redifined in subclasses.
-     * If it is not defined, the make_id() method must be explicitly called.
-     * 
-     * @type string
-     */
-    identifier_prefix: null,
-    /**
-     * Contructor.
-     * 
-     * @params {openerp.base.search.BaseWidget} parent The parent widget.
-     */
-    init: function (parent) {
-		this.children = [];
-        this.parent = parent;
-        if(parent != null) {
-        	parent.children.push(this);
-        }
-        if(this.identifier_prefix != null) {
-        	this.make_id(this.identifier_prefix);
-        }
-    },
-    /**
-     * Sets and returns a globally unique identifier for the widget.
-     *
-     * If a prefix is appended, the identifier will be appended to it.
-     *
-     * @params sections prefix sections, empty/falsy sections will be removed
-     */
-    make_id: function () {
-        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
-        return this.element_id;
-    },
-    /**
-     * "Starts" the widgets. Called at the end of the rendering, this allows
-     * to get a jQuery object referring to the DOM ($element attribute).
-     */
-    start: function () {
-        this._super();
-        if (this.element_id) {
-            this.$element = $(document.getElementById(
-                this.element_id));
-        }
-    },
-    /**
-     * "Stops" the widgets. Called when the view destroys itself, this
-     * lets the widgets clean up after themselves.
-     */
-    stop: function () {
-    	var tmp_children = this.children;
-    	this.children = [];
-    	_.each(tmp_children, function(x) {
-    		x.stop();
-    	});
-    	if(this.$element != null) {
-    		this.$element.remove();
-    	}
-    	if(this.parent != null) {
-    		var _this = this;
-    		parent.children = _.reject(parent.children, function(x) { return x === _this;});
-            this.parent = null;
-    	}
-        this._super();
-    },
-    /**
-     * Render the widget. This.template must be defined.
-     * The content of the current object is passed as context to the template.
-     * 
-     * @param {object} additional Additional context arguments to pass to the template.
-     */
-    render: function (additional) {
-        return QWeb.render(this.template, _.extend({}, this,
-        		additional != null ? additional : {}));
-    }
-});
+
 
 openerp.base.Widget = openerp.base.Controller.extend({
     // TODO Change this to init: function(view, node) { and use view.session and a new element_id for the super

From ae3ee42fd0df384b024c9a66fe9a39011e579a46 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 29 Mar 2011 15:59:22 +0200
Subject: [PATCH 07/10] [FIX] Bug with propositions.

bzr revid: nicolas.vanhoren@openerp.com-20110329135922-nswtf2zq5reby27f
---
 addons/base/static/openerp/js/base_views.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index bfff8bed26b..50062fdbdfc 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -851,7 +851,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
         group.start();
 	},
 	remove: function(group) {
-		this.groups_list = _.select(this.groups_list, function(x) {return ! x === group});
+		this.groups_list = _.without(this.groups_list, group);
 		group.stop();
 	},
     start: function () {
@@ -897,7 +897,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
         prop.start();
 	},
 	remove: function(prop) {
-		this.propositions_list = _.reject(this.propositions_list, function(x) {return x === prop});
+		this.propositions_list = _.without(this.propositions_list, prop);
 		prop.stop();
 	},
     start: function () {
@@ -913,7 +913,6 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
         var delete_btn = $root.find('.searchview_extended_delete_group');
         delete_btn.click(function (e) {
         	$this.parent.remove($this);
-        	console.log(delete_btn);
             e.stopPropagation();
             e.preventDefault();
         });
@@ -931,7 +930,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
 	}
 });
 
-extended_filters_types = {
+openerp.base.search.extended_filters_types = {
 	char: {
 		operators: [
 		            {value: "ilike", text: "contains"},
@@ -945,7 +944,7 @@ extended_filters_types = {
 		],
 		build_component: function(parent) {
 			return new openerp.base.search.ExtendedSearchProposition.Char(parent);
-		},
+		}
 	}
 };
 
@@ -963,13 +962,14 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     start: function () {
         this._super();
 	    this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
-	    $this = this;
+	    var $this = this;
 	    this.$element.find(".searchview_extended_prop_field").change(function(e) {
 	    	$this.changed();
             e.stopPropagation();
             e.preventDefault();
 	    });
-	    this.$element.find('.searchview_extended_delete_prop').click(function (e) {
+	    var delete_btn = this.$element.find('.searchview_extended_delete_prop');
+	    delete_btn.click(function (e) {
         	$this.parent.remove($this);
             e.stopPropagation();
             e.preventDefault();
@@ -978,7 +978,7 @@ 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.set_selected(_.detect(this.fields, function(x) {return x.name == nval;}));
 		}
 	},
 	set_selected: function(selected) {
@@ -994,6 +994,7 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
 			return;
 		}
 		var type = selected.obj.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) {
 			option = jQuery('<option/>');

From 301d170ef8dbac9727a8ac44233f7bd1cff638ca Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 29 Mar 2011 16:22:17 +0200
Subject: [PATCH 08/10] [IMP] Cleaned code of extended filters.

bzr revid: nicolas.vanhoren@openerp.com-20110329142217-zfp5b3lw19f8bzsf
---
 addons/base/static/openerp/base.xml         |  3 +-
 addons/base/static/openerp/js/base_views.js | 67 ++++++++-------------
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 304c1c1b4c9..699f7ed4778 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -411,7 +411,6 @@
 	</div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
-	<!-- TODO: remove test -->
-	<input t-att-id="element_id" t-att-value="element_id" style="width: 300px;"></input>
+	<input t-att-id="element_id"></input>
 </t>
 </templates>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 50062fdbdfc..656c307675a 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -805,7 +805,7 @@ openerp.base.search.FilterGroup = openerp.base.search.Widget.extend({
         });
     }
 });
-add_expand_listener = function($root) {
+openerp.base.search.add_expand_listener = function($root) {
 	$root.find('a.searchview_group_string').click(function (e) {
         $root.toggleClass('folded expanded');
         e.stopPropagation();
@@ -829,7 +829,7 @@ openerp.base.search.Group = openerp.base.search.Widget.extend({
             .chain()
             .flatten()
             .each(function (widget) { widget.start(); });
-        add_expand_listener(this.$element);
+        openerp.base.search.add_expand_listener(this.$element);
     }
 });
 
@@ -839,41 +839,32 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
     init: function (parent, fields) {
 	    this._super(parent);
         this.fields = fields;
-        this.groups_list = [];
 	},
 	add_group: function(group) {
     	var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
-		var $root = this.$element;
-		this.groups_list.push(group);
         var render = group.render({});
-        var groups_div = $root.find('.searchview_extended_groups_list');
-        groups_div.append(render);
+        this.$element.find('.searchview_extended_groups_list').append(render);
         group.start();
 	},
-	remove: function(group) {
-		this.groups_list = _.without(this.groups_list, group);
-		group.stop();
-	},
     start: function () {
         this._super();
-        var $root = this.$element;
-        var $this = this;
-        add_expand_listener($root);
+        var _this = this;
+        openerp.base.search.add_expand_listener(this.$element);
         this.add_group();
-        $root.find('.searchview_extended_add_group').click(function (e) {
-            $this.add_group();
+        this.$element.find('.searchview_extended_add_group').click(function (e) {
+            _this.add_group();
             e.stopPropagation();
             e.preventDefault();
         });
         // TODO: remove test
-        $root.find('.test_get_domain').click(function (e) {
-        	$root.find('.test_domain').text(JSON.stringify($this.get_domain()));
+        this.$element.find('.test_get_domain').click(function (e) {
+        	_this.$element.find('.test_domain').text(JSON.stringify(_this.get_domain()));
             e.stopPropagation();
             e.preventDefault();
         });
 	},
 	get_domain: function() {
-		var domain = _.reduce(this.groups_list,
+		var domain = _.reduce(this.children,
 				function(mem, x) { return mem.concat(x.get_domain());}, []);
 		return domain;
 	}
@@ -885,40 +876,31 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
     init: function (parent, fields) {
 	    this._super(parent);
 	    this.fields = fields;
-	    this.propositions_list = [];
 	},
 	add_prop: function() {
-        var $root = this.$element;
 		var prop = new openerp.base.search.ExtendedSearchProposition(this, this.fields);
-        this.propositions_list.push(prop);
         var render = prop.render({});
-        var propositions_div = $root.find('.searchview_extended_propositions_list');
-        propositions_div.append(render);
+        this.$element.find('.searchview_extended_propositions_list').append(render);
         prop.start();
 	},
-	remove: function(prop) {
-		this.propositions_list = _.without(this.propositions_list, prop);
-		prop.stop();
-	},
     start: function () {
         this._super();
-        var $root = this.$element;
-        var $this = this;
+        var _this = this;
         this.add_prop();
-        $root.find('.searchview_extended_add_proposition').click(function (e) {
-        	$this.add_prop();
+        this.$element.find('.searchview_extended_add_proposition').click(function (e) {
+        	_this.add_prop();
             e.stopPropagation();
             e.preventDefault();
         });
-        var delete_btn = $root.find('.searchview_extended_delete_group');
+        var delete_btn = this.$element.find('.searchview_extended_delete_group');
         delete_btn.click(function (e) {
-        	$this.parent.remove($this);
+        	_this.stop();
             e.stopPropagation();
             e.preventDefault();
         });
 	},
 	get_domain: function() {
-		var props = _(this.propositions_list).chain().map(function(x) {
+		var props = _(this.children).chain().map(function(x) {
 			return x.get_proposition();
 		}).compact().value();
 		var choice = this.$element.find(".searchview_extended_group_choice").val();
@@ -962,15 +944,15 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     start: function () {
         this._super();
 	    this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
-	    var $this = this;
+	    var _this = this;
 	    this.$element.find(".searchview_extended_prop_field").change(function(e) {
-	    	$this.changed();
+	    	_this.changed();
             e.stopPropagation();
             e.preventDefault();
 	    });
 	    var delete_btn = this.$element.find('.searchview_extended_delete_prop');
 	    delete_btn.click(function (e) {
-        	$this.parent.remove($this);
+        	_this.stop();
             e.stopPropagation();
             e.preventDefault();
         });
@@ -982,12 +964,11 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
 		}
 	},
 	set_selected: function(selected) {
-		var $root = this.$element;
-		var tmp = $root.find('.searchview_extended_prop_op');
+		var _this = this;
 		if(this.attrs.selected != null) {
 			this.value_component.stop();
 			this.value_component = null;
-			$root.find('.searchview_extended_prop_op').html('');
+			this.$element.find('.searchview_extended_prop_op').html('');
 		}
 		this.attrs.selected = selected;
 		if(selected == null) {
@@ -1000,11 +981,11 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
 			option = jQuery('<option/>');
 			option.attr('value', operator.value);
 			option.text(operator.text);
-			option.appendTo($root.find('.searchview_extended_prop_op'));
+			option.appendTo(_this.$element.find('.searchview_extended_prop_op'));
 		});
 		this.value_component = extended_filters_types[type].build_component(this);
 		var render = this.value_component.render({});
-		$root.find('.searchview_extended_prop_value').html(render);
+		this.$element.find('.searchview_extended_prop_value').html(render);
 		this.value_component.start();
 	},
 	get_proposition: function() {

From c8469427c47149ea693d06ef86d669a3b028912b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 29 Mar 2011 16:35:25 +0200
Subject: [PATCH 09/10] [IMP] Wip extended filters. Is functional. Still need
 to improve design, allow to save and implement all data types.

bzr revid: nicolas.vanhoren@openerp.com-20110329143525-3nhtrgrpgkykg7s9
---
 addons/base/static/openerp/base.xml         |  5 -----
 addons/base/static/openerp/js/base_views.js | 16 +++++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 699f7ed4778..4b969ce4136 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -372,11 +372,6 @@
 		<t t-set="content">
 			<div class="searchview_extended_groups_list"></div>
 			<button class="searchview_extended_add_group">Add group of conditions</button>
-			<!-- TODO: remove test -->
-			<div>
-			<button class="test_get_domain">Get Domain</button>
-			<span class="test_domain"></span>
-			</div>
 		</t>
 	</t>
 </t>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 656c307675a..6b7161ed8c9 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -603,7 +603,9 @@ openerp.base.SearchView = openerp.base.Controller.extend({
             data.fields_view.fields);
 
         // for extended search view
-        lines.push([new openerp.base.search.ExtendedSearch(null, data.fields_view.fields)]);
+        var ext = new openerp.base.search.ExtendedSearch(null, data.fields_view.fields);
+        lines.push([ext]);
+        this.inputs.push(ext);
         
         var render = QWeb.render("SearchView", {
             'view': data.fields_view['arch'],
@@ -856,14 +858,14 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
             e.stopPropagation();
             e.preventDefault();
         });
-        // TODO: remove test
-        this.$element.find('.test_get_domain').click(function (e) {
-        	_this.$element.find('.test_domain').text(JSON.stringify(_this.get_domain()));
-            e.stopPropagation();
-            e.preventDefault();
-        });
+	},
+	get_context: function() {
+		return null;
 	},
 	get_domain: function() {
+		if(this.$element.hasClass("folded")) {
+			return null;
+		}
 		var domain = _.reduce(this.children,
 				function(mem, x) { return mem.concat(x.get_domain());}, []);
 		return domain;

From 97e63b9e579f7486a03e12591e38b91d6c029015 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 29 Mar 2011 16:46:23 +0200
Subject: [PATCH 10/10] [IMP] Improved BaseWidget.

bzr revid: nicolas.vanhoren@openerp.com-20110329144623-vnxtfc9ouclkq5sa
---
 addons/base/static/openerp/js/base_views.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 6b7161ed8c9..12bfc84939d 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -407,13 +407,13 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
     template: null,
     /**
      * The prefix used to generate an id automatically. Should be redifined in subclasses.
-     * If it is not defined, the make_id() method must be explicitly called.
+     * If it is not defined, a default identifier will be used.
      * 
      * @type string
      */
-    identifier_prefix: null,
+    identifier_prefix: 'generic-identifier',
     /**
-     * Contructor.
+     * Contructor. Also initialize the identifier.
      * 
      * @params {openerp.base.search.BaseWidget} parent The parent widget.
      */
@@ -423,9 +423,7 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
         if(parent != null) {
         	parent.children.push(this);
         }
-        if(this.identifier_prefix != null) {
-        	this.make_id(this.identifier_prefix);
-        }
+        this.make_id(this.identifier_prefix);
     },
     /**
      * Sets and returns a globally unique identifier for the widget.
@@ -444,10 +442,8 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
      */
     start: function () {
         this._super();
-        if (this.element_id) {
-            this.$element = $(document.getElementById(
-                this.element_id));
-        }
+        var tmp = document.getElementById(this.element_id)
+        this.$element = tmp != null ? $(tmp) : null;
     },
     /**
      * "Stops" the widgets. Called when the view destroys itself, this