diff options
| author | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-07-25 11:16:10 +0530 |
|---|---|---|
| committer | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-07-25 11:16:10 +0530 |
| commit | d657a3dff23511d3046bf1ac27b8076447305881 (patch) | |
| tree | 85b146292a3d521d4523507468391741cd0b3354 /addons/base/static/src/xml/base.xml | |
| parent | 509aaab131b6f0485bac50aaf18dbf8eb8bdcd7e (diff) | |
| parent | 8737e4af14b1dbf01315bd2e10648f511f4126ab (diff) | |
[MERGE] Merge with trunk upto revision no 672.
bzr revid: ysa@tinyerp.com-20110725054610-2fkhv81amdhsqz44
Diffstat (limited to 'addons/base/static/src/xml/base.xml')
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index ad55f2f90a5..d8250d2c4d5 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,21 @@ <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-set="i" t-value="0"/> + <t t-foreach="filters" t-as="filter"> + <option t-att-value="'get:' + i"><t t-esc="filter.name"/></option> + <t t-set="i" t-value="i+1"/> + </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"> |