summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-05-03 14:59:49 +0200
committerXavier Morel <xmo@openerp.com>2012-05-03 14:59:49 +0200
commit6d12c155a4fc36fc7d7906aaefcc9da8c0a6e48d (patch)
tree6fe0f7948aedace9236008726b91935da05b1df8 /addons/web/static/src
parent836dfa6aa8b8abd62c16abb86ea04cdd0d76a932 (diff)
[TEST] serialization of search domains & contexts by the search view
bzr revid: xmo@openerp.com-20120503125949-2m8euott3xzyivdm
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/search.js21
1 files changed, 10 insertions, 11 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2227aa52465..4417912b6d4 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -656,7 +656,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
do_search: function () {
var domains = [], contexts = [], groupbys = [], errors = [];
- return this.on_search([], [], []);
this.query.each(function (facet) {
var field = facet.get('field');
try {
@@ -902,12 +901,12 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
/**
* Fetches contexts for all enabled filters in the group
*
- * @param {VS.model.SearchFacet} facet
+ * @param {openerp.web.search.Facet} facet
* @return {*} combined contexts of the enabled filters in this group
*/
get_context: function (facet) {
- var contexts = _(facet.get('values')).chain()
- .map(function (filter) { return filter.attrs.context; })
+ var contexts = _(facet.values).chain()
+ .map(function (f) { return f.get('value').attrs.context; })
.reject(_.isEmpty)
.value();
@@ -924,8 +923,8 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
* @return {Array} enabled filters in this group
*/
get_groupby: function (facet) {
- return _(facet.get('values')).chain()
- .map(function (filter) { return filter.attrs.context; })
+ return _(facet.values).chain()
+ .map(function (f) { return f.get('value').attrs.context; })
.reject(_.isEmpty)
.value();
},
@@ -936,8 +935,8 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
* @return {*} combined domains of the enabled filters in this group
*/
get_domain: function (facet) {
- var domains = _(facet.get('values')).chain()
- .map(function (filter) { return filter.attrs.domain; })
+ var domains = _(facet.values).chain()
+ .map(function (f) { return f.get('value').attrs.domain; })
.reject(_.isEmpty)
.value();
@@ -1014,14 +1013,14 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
return facet.value();
},
get_context: function (facet) {
- var val = this.get_value(facet);
// A field needs a value to be "active", and a context to send when
// active
- var has_value = (val !== null && val !== '');
var context = this.attrs.context;
- if (!(has_value && context)) {
+ if (!context) {
return;
}
+ var val = this.get_value(facet);
+ var has_value = (val !== null && val !== '');
return new instance.web.CompoundContext(context)
.set_eval_context({self: val});
},