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] [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;