Skip to content
This repository was archived by the owner on Sep 19, 2018. It is now read-only.

Commit dd1d4cc

Browse files
committed
Fixed updating number of search results
1 parent dceef98 commit dd1d4cc

File tree

4 files changed

+30
-7
lines changed

4 files changed

+30
-7
lines changed

static/js/faceted-search-events.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@ var Codeweek = window.Codeweek || {};
2323
History.replaceState({}, document.title, url+'?'+data);
2424
container.empty();
2525
container.html(fragment);
26-
all_results.text($('body').data('all_results'));
26+
var no_results = $('body').data('all_results');
27+
28+
if (no_results > 0 ) {
29+
all_results.text(no_results);
30+
$('#all-search-results').show();
31+
} else {
32+
$('#all-search-results').hide();
33+
}
34+
2735
});
2836
});
2937
});

web/templates/pages/ajax_faceted_search_events.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{% load endless %}
2+
<script type="text/javascript">
3+
$('body').data('all_results', {{all_results}});
4+
</script>
25

36
{% if events %}
47
{% lazy_paginate 6 events as pag_events %}
@@ -14,6 +17,3 @@ <h3>
1417
</h3>
1518
{% endif %}
1619

17-
<script type="text/javascript">
18-
$('body').data('all_results', {{all_results}});
19-
</script>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{% load endless %}
2+
3+
{% if events %}
4+
{% lazy_paginate 6 events as pag_events %}
5+
{% for event in pag_events %}
6+
{% include 'layout/event_tile_long.html' %}
7+
{% endfor %}
8+
9+
{% show_more %}
10+
11+
{% else %}
12+
<h3>
13+
Sorry, no events matching your search criteria. Try expanding your search.
14+
</h3>
15+
{% endif %}
16+

web/views/events.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ def search_events(request):
273273
search_query = request.GET.get('q', '')
274274

275275
template = 'pages/search_events.html'
276-
page_template = 'pages/ajax_faceted_search_events.html'
277276

278277
if request.method == 'POST':
279278
form = SearchEventForm(request.POST)
@@ -295,7 +294,7 @@ def search_events(request):
295294

296295
if request.is_ajax():
297296
return render_to_response(
298-
page_template,
297+
'pages/ajax_faceted_search_events.html',
299298
{
300299
'events':events,
301300
'all_results': events.count(),
@@ -305,7 +304,7 @@ def search_events(request):
305304
return render_to_response(
306305
template,
307306
{
308-
'page_template': page_template,
307+
'page_template': 'pages/faceted_search_results.html',
309308
'events': events,
310309
'form': form,
311310
'country': country_filter,

0 commit comments

Comments
 (0)