odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Merge Advanced Filter button in select box and float it right 

bzr revid: fme@openerp.com-20111214101344-61j1cpcjy4bdsz0w
This commit is contained in:
Fabien Meghazi 2011-12-14 11:13:44 +01:00
parent 515ff465a0
commit 83f694ed7a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/css/base.css
View File

@ -717,11 +717,9 @@ label.error {
.openerp .oe_search-view-buttons {
padding: 10px 0 10px 0;
}
.openerp .oe_search-view-custom-filter-btn span {
background: url(/web/static/src/img/icons/gtk-add.png) repeat-y;
padding-left: 18px;
.openerp .oe_search-view-filters-management {
float: right;
}
.openerp .searchview_extended_add_proposition span {
font-size: 0.9em;
background: url(/web/static/src/img/icons/gtk-add.png) repeat-y;

5
addons/web/static/src/js/search.js
View File

@ -155,6 +155,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
var ext = new openerp.web.search.ExtendedSearch(this, this.model);
lines.push([ext]);
this.inputs.push(ext);
this.extended_search = ext;
var render = QWeb.render("SearchView", {
'view': data.fields_view['arch'],
@ -163,7 +164,6 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
});
this.$element.html(render);
this.$element.find(".oe_search-view-custom-filter-btn").click(ext.on_activate);
var f = this.$element.find('form');
this.$element.find('form')
@ -199,6 +199,9 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
var select = this.$element.find(".oe_search-view-filters-management");
var val = select.val();
switch(val) {
case 'advanced_filter':
this.extended_search.on_activate();
break;
case 'add_to_dashboard':
this.on_add_to_dashboard();
break;

2
addons/web/static/src/xml/base.xml
View File

@ -1151,7 +1151,6 @@
<div class="oe_search-view-buttons">
<button>Search</button>
<button type="reset">Clear</button>
<button type="button" class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>
<select class="oe_search-view-filters-management">
</select>
</div>
@ -1165,6 +1164,7 @@
</t>
</optgroup>
<optgroup label="-- Actions --">
<option value="advanced_filter">Advanced Filter</option>
<option value="save_filter">Save Filter</option>
<option value="add_to_dashboard">Add to Dashboard</option>
<option value="manage_filters">Manage Filters</option>