[IMP] Modified search view to factorise expanding functionality.

bzr revid: nicolas.vanhoren@openerp.com-20110328073722-stytrmyog74ikar5

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({