Skip to content

Commit

Permalink
Fixes ckan#2657 by not ignoring filters when embedded
Browse files Browse the repository at this point in the history
  • Loading branch information
mattfullerton committed Oct 7, 2016
1 parent efe47e8 commit 1fc8e0f
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions ckanext/reclineview/theme/public/recline_view.js
Expand Up @@ -63,17 +63,18 @@ this.ckan.module('recline_view', function (jQuery, _) {
var query = new recline.Model.Query();
query.set({ size: reclineView.limit || 100 });
query.set({ from: reclineView.offset || 0 });


var urlFilters = {};
try {
if (window.parent.ckan.views && window.parent.ckan.views.filters) {
var defaultFilters = reclineView.filters || {},
urlFilters = window.parent.ckan.views.filters.get(),
filters = $.extend({}, defaultFilters, urlFilters);
$.each(filters, function (field,values) {
query.addFilter({type: 'term', field: field, term: values});
});
urlFilters = window.parent.ckan.views.filters.get();
}
} catch(e) {}
var defaultFilters = reclineView.filters || {},
filters = $.extend({}, defaultFilters, urlFilters);
$.each(filters, function (field,values) {
query.addFilter({type: 'term', field: field, term: values});
});

dataset.queryState.set(query.toJSON(), {silent: true});

Expand Down

0 comments on commit 1fc8e0f

Please sign in to comment.