From c8bc88c96a9c27dd984586b688f985165ab94f64 Mon Sep 17 00:00:00 2001 From: amercader Date: Tue, 24 Jun 2014 16:55:59 +0100 Subject: [PATCH] [#1791] Keep filters when ordering dataset listings There is a `form.hidden_from_list` macro call in the `search_form.html` snippet that did not get the `fields` variable it needed to create the necessary hidden inputs. --- ckan/templates/group/read.html | 2 +- ckan/templates/organization/read.html | 2 +- ckan/templates/package/search.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index 0fa87eb8d7b..785f6446c50 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -18,7 +18,7 @@ (_('Last Modified'), 'metadata_modified desc'), (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ] %} - {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %} + {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params, fields=c.fields %} {% endblock %} {% block packages_list %} {% if c.page.items %} diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html index e2a6a04b090..5ed64c9c1b3 100644 --- a/ckan/templates/organization/read.html +++ b/ckan/templates/organization/read.html @@ -22,7 +22,7 @@ (_('Last Modified'), 'metadata_modified desc'), (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ] %} - {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %} + {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params, fields=c.fields %} {% endblock %} {% block packages_list %} {% if c.page.items %} diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html index 6c8173eb772..525f7957040 100644 --- a/ckan/templates/package/search.html +++ b/ckan/templates/package/search.html @@ -32,7 +32,7 @@ (_('Last Modified'), 'metadata_modified desc'), (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ] %} - {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, show_empty=request.params, error=c.query_error %} + {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, show_empty=request.params, error=c.query_error, fields=c.fields %} {% endblock %} {% block package_search_results_list %} {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}