diff --git a/ckanext/odsh/harvest_templates/source/search.html b/ckanext/odsh/harvest_templates/source/search.html
index 699fb0e45de450c5e014710c3791baa302dfe178..19e25c4346c540eaffa74b7ec50ae8143a226ef3 100644
--- a/ckanext/odsh/harvest_templates/source/search.html
+++ b/ckanext/odsh/harvest_templates/source/search.html
@@ -54,7 +54,7 @@
(_('Last Modified'), 'metadata_modified desc'),
(_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
%}
- {% snippet 'snippets/search_form.html', type='harvest', 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, placeholder=_("Search harvest sources...") %}
+ {% snippet 'snippets/search_form.html', type='harvest', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, show_empty=request.args, error=c.query_error, placeholder=_("Search harvest sources...") %}
#}
{{ h.snippet('snippets/source_list.html', sources=c.page.items, show_organization=true) }}
diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py
index 43d6f09b3c7ee1b62fcf1a04d3d08fdc22e6d216..044e879ffec5d751603ffde9f6766369addb5d6d 100644
--- a/ckanext/odsh/helpers.py
+++ b/ckanext/odsh/helpers.py
@@ -211,7 +211,7 @@ def odsh_has_more_facets(facet, limit=None, exclude_active=False):
for facet_item in c.search_facets.get(facet)['items']:
if not len(facet_item['name'].strip()) or facet_item['count']==0:
continue
- if not (facet, facet_item['name']) in list(request.params.items()):
+ if not (facet, facet_item['name']) in list(request.args.items()):
facets.append(dict(active=False, **facet_item))
elif not exclude_active:
facets.append(dict(active=True, **facet_item))
diff --git a/ckanext/odsh/templates/organization/index.html b/ckanext/odsh/templates/organization/index.html
index f3d900d051a44d8c566489047588064c5f33a835..9689c3fae462e1c04d76e798a4d3cf721e342093 100644
--- a/ckanext/odsh/templates/organization/index.html
+++ b/ckanext/odsh/templates/organization/index.html
@@ -32,14 +32,11 @@
{% endif %}
<h1 class="hide-heading">{% block page_heading %}{{ _('Organizations') }}{% endblock %}</h1>
{% block organizations_search_form %}
- <div class="row organization-list-title">
- {% snippet 'snippets/search_form.html', form_id='organization-search-form', type='organization', query=c.q,
- sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search organizations...'),
- show_empty=request.params, hide_sorting=true,always_show_filter_list=true %}
- </div>
+ {% snippet 'snippets/search_form.html', form_id='organization-search-form', type=group_type, query=q, sorting_selected=sort_by_selected, count=page.item_count, placeholder=_('Search organizations...'), show_empty=request.args, no_bottom_border=true if page.items, sorting = [(_('Name Ascending'), 'title asc'), (_('Name Descending'), 'title desc')] %}
{% endblock %}
+
{% block organizations_list %}
- {% if c.page.items or request.params %}
+ {% if c.page.items or request.args %}
{% if c.page.items %}
{% snippet "organization/snippets/odsh_organization_list.html", organizations=c.page.items %}
{% endif %}
diff --git a/ckanext/odsh/templates/organization/read.html b/ckanext/odsh/templates/organization/read.html
index 83a6f9672af06c721a6309d689d36ff2b7912403..6eb9f191b8bc7142e939f4c4aaa8e07063045bca 100644
--- a/ckanext/odsh/templates/organization/read.html
+++ b/ckanext/odsh/templates/organization/read.html
@@ -34,7 +34,7 @@ icon='plus-square' %}
<form id='organization-datasets-search-form' method="get" data-module="select-switch">
{% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', 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, force_title=_('Datasets') %}
+datasets...'), show_empty=request.args, fields=c.fields, force_title=_('Datasets') %}
</form>
{% endblock %}
{% block packages_list %}
diff --git a/ckanext/odsh/templates/package/search.html b/ckanext/odsh/templates/package/search.html
index eeb52df6d5ee186a4e22ea80d3fc5a4bc82b32a5..5d2a6ba077430ee4f7a51cec6316ddfa2f2f1546 100644
--- a/ckanext/odsh/templates/package/search.html
+++ b/ckanext/odsh/templates/package/search.html
@@ -60,16 +60,16 @@ method="get" data-module="select-switch">
</div>
{% block daterange_search %}
- {% set has_range_filter = request.params.get('ext_startdate') or request.params.get('ext_enddate') %}
+ {% set has_range_filter = request.args.get('ext_startdate') or request.args.get('ext_enddate') %}
<section class="module module-narrow module-shallow">
<nav>
<div class="nav-title">{{_('Period')}}</div>
<div class="rangesearch-controls">
{% import 'macros/form.html' as form %}
<div class='controls rangesearch' >
- {%- set start = request.params['ext_startdate'] -%}
+ {%- set start = request.args['ext_startdate'] -%}
{%- set start_error = h.odsh_render_datetime(start, False) == '' and start -%}
- {%- set end = request.params['ext_enddate'] -%}
+ {%- set end = request.args['ext_enddate'] -%}
{%- set end_error = h.odsh_render_datetime(end, False) == '' and end -%}
{%- set typeStart = 'text' if (start_error or not start) else 'date' -%}
{%- set typeEnd = 'text' if (end_error or not end) else 'date' -%}
diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html
index 092a03a653a559f56ea407f18fbb476028ebf00b..09b45a2367039960fc17adf5ae164d46366cf7aa 100644
--- a/ckanext/odsh/templates/snippets/search_form.html
+++ b/ckanext/odsh/templates/snippets/search_form.html
@@ -24,7 +24,7 @@
{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
{% set form_id = form_id if form_id else false %}
-<div class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" >
+<form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
{% block search_input %}
{% endblock %}
@@ -64,7 +64,7 @@
{% endfor %}
</select>
{% block search_sortby_button %}
- <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
+ <button class="btn btn-default js-hide" type="submit">{{ _('Go') }}</button>
{% endblock %}
</div>
{% endif %}
@@ -106,10 +106,10 @@
{% endif %}
{% endif %}
<div id="datesearch-filter">
- {%set start_date=h.odsh_render_datetime(request.params.get('ext_startdate'), False)%}
- {%set end_date=h.odsh_render_datetime(request.params.get('ext_enddate'), False)%}
- {%- set start_error = start_date == '' and request.params.get('ext_startdate')-%}
- {%- set end_error = end_date == '' and request.params.get('ext_enddate')-%}
+ {%set start_date=h.odsh_render_datetime(request.args.get('ext_startdate'), False)%}
+ {%set end_date=h.odsh_render_datetime(request.args.get('ext_enddate'), False)%}
+ {%- set start_error = start_date == '' and request.args.get('ext_startdate')-%}
+ {%- set end_error = end_date == '' and request.args.get('ext_enddate')-%}
{% if start_date or end_date or start_error or end_error%}
<p class="filter-list">
{% if start_date and not start_error%}
@@ -169,9 +169,9 @@
{% endif %}
</div>
<div >
- {%set ext_bbox=request.params.get('ext_bbox')%}
- {%set ext_prev_extent=request.params.get('ext_prev_extent')%}
- {%set ext_location=request.params.get('ext_location')%}
+ {%set ext_bbox=request.args.get('ext_bbox')%}
+ {%set ext_prev_extent=request.args.get('ext_prev_extent')%}
+ {%set ext_location=request.args.get('ext_location')%}
{% if ext_bbox %}
<p class="filter-list">
<span class="filtered pill">
@@ -190,7 +190,7 @@
</div>
{% endblock %}
-</div>
+ </form>
{% if show_empty and count == 0 and not error %}
<p class="extra">{{ _("Please try another search.") }}</p>