[imp] managed filters startup

bzr revid: nicolas.vanhoren@openerp.com-20110722150537-i01yezky8fcar90h

2 files changed, 18 insertions, 6 deletions

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index e6df3767f4a..444a3a8d545 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -141,7 +141,13 @@ openerp.base.SearchView = openerp.base.Controller.extend({
         }).value();
         
         // filters management
-        this.$element.find(".oe_search-view-filters-management").change(this.on_filters_management);
+        var self = this;
+        var filters_set = new openerp.base.DataSetStatic(this, "ir.filters");
+        filters_set.call("get_filters", [this.dataset.model]).then(function(result) {
+            var filters = self.$element.find(".oe_search-view-filters-management");
+            filters.html(QWeb.render("SearchView.managed-filters", {filters: result}));
+            filters.change(self.on_filters_management);
+        });
 
         var self = this;
         $.when.apply(null, widget_starts).then(function () {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 04841a2e297..b95d9da5aea 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -62,7 +62,7 @@
                         <td><label for="db">Database:</label></td>
                         <td>
                             <t t-if="!db_list">
-                                <input type="text" name="db" value="trunk" autofocus="true"/>
+                                <input type="text" name="db" value="" autofocus="true"/>
                             </t>
                             <t t-if="db_list">
                                 <select name="db">
@@ -664,14 +664,20 @@
             <input type="reset" value="Clear"/>
             <button class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>
             <select class="oe_search-view-filters-management">
-                <option value="_filters">-- Filters --</option>
-                <option value="_actions">-- Actions --</option>
-                <option value="save_filter">Save Filter</option>
-                <option value="manage_filters">Manage Filters</option>
+
             </select>
         </div>
     </form>
 </t>
+<t t-name="SearchView.managed-filters">
+    <option value="_filters">-- Filters --</option>
+    <t t-foreach="filters" t-as="filter">
+        <option t-att-value="'get:' + filter.id"><t t-esc="filter.name"/></option>
+    </t>
+    <option value="_actions">-- Actions --</option>
+    <option value="save_filter">Save Filter</option>
+    <option value="manage_filters">Manage Filters</option>
+</t>
 <t t-name="SearchView.render_lines">
     <table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">