[add] kinda forgot about the filters-within-fields things

bzr revid: xmo@openerp.com-20110324142330-711hpfm4younpcim

addons/base/static/openerp/base.xml

@@ -302,17 +302,18 @@
     <br t-if="attrs.icon and attrs.string"/>
     <t t-esc="attrs.string"/>
 </button>
-<div t-name="SearchView.filters" class="filter_label_group"
+<span t-name="SearchView.filters" class="filter_label_group"
     ><t t-foreach="filters" t-as="filter"
         ><t t-raw="filter.render(defaults)"/></t
-></div>
+></span>
 <t t-name="SearchView.field">
     <label style="display: block" t-att-title="attrs.help">
         <t t-esc="attrs.string || attrs.name"/>
         <span t-if="attrs.help">(?)</span>
     </label>
-    <div>
+    <div style="white-space: nowrap;">
         <input type="text" t-att-name="attrs.name"/>
+        <t t-if="filters.length" t-raw="filters.render(defaults)"/>
     </div>
 </t>
 <t t-name="SearchView.group">

addons/base/static/openerp/js/base_views.js

@@ -513,6 +513,11 @@ openerp.base.search.Field = openerp.base.search.Widget.extend({
     init: function (view_section, field, view) {
         this._super(view);
         this.attrs = _.extend({}, field, view_section.attrs);
+        this.filters = new openerp.base.search.FilterGroup(_.map(
+            view_section.children, function (filter_node) {
+                return new openerp.base.search.Filter(
+                    filter_node, view);
+        }), view);
     }
 });
 openerp.base.search.CharField = openerp.base.search.Field.extend({