Merge pull request #289 from okfn/264-multiple-filters

[#264] Fix for #264 from ckan-updates branch.
This commit is contained in:
Rufus Pollock 2012-12-10 08:51:30 -08:00
commit 498001b4d9

View File

@ -499,11 +499,7 @@ my.Query = Backbone.Model.extend({
var ourfilter = JSON.parse(JSON.stringify(filter));
// not fully specified so use template and over-write
if (_.keys(filter).length <= 3) {
ourfilter = _.extend(
// crude deep copy
JSON.parse(JSON.stringify(this._filterTemplates[filter.type])),
ourfilter
);
ourfilter = _.defaults(ourfilter, this._filterTemplates[filter.type]);
}
var filters = this.get('filters');
filters.push(ourfilter);