summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authormsh-openerp <msh@tinyerp.com>2012-06-08 16:08:42 +0530
committermsh-openerp <msh@tinyerp.com>2012-06-08 16:08:42 +0530
commit6ae3c8dbafdff9d05f1b72165accab5bb4a3be1d (patch)
treebd3ec9a2ed31add46f3b992a99a3a9af83025875 /addons/web/static/src
parent6c4568c54874f65dbea6ecf4d7f4a0d4ae045e57 (diff)
parentdacf7553f48ff9389374737ed2444849ed6a3040 (diff)
[FIX]Refixed the issue of filter, removed unnecessary variables and just put the filter on current chaining process.
bzr revid: msh@tinyerp.com-20120608103842-igqr6t9bxbdvd7i7
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/search.js3
-rw-r--r--addons/web/static/src/xml/base.xml3
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 13530ae3f89..36db9ee5b47 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1221,7 +1221,8 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
init: function (parent, fields) {
this._super(parent);
this.fields = _(fields).chain()
- .map(function(val, key) { return _.extend({}, val, {'name': key}); })
+ .filter(function(field){return typeof field.store === 'undefined' || field.store || field.fnct_search})
+ .map(function(val, key) {return _.extend({}, val, {'name': key}); })
.sortBy(function(field) {return field.string;})
.value();
this.attrs = {_: _, fields: this.fields, selected: null};
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 59cb69d9da6..63092e47283 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1442,8 +1442,7 @@
<div t-att-id="widget.element_id">
<select class="searchview_extended_prop_field">
<t t-foreach="widget.attrs.fields" t-as="field">
- <option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search"
- t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}"
+ <option t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}"
t-att-value="field.name">
<t t-esc="field.string"/>
</option>