From c70f4f233b8ef955212a968998c4b80b1b1f60ed Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 22 Jan 2018 16:50:20 +0100 Subject: Fix search form summary --- ishtar_common/static/js/ishtar.js | 6 +++--- ishtar_common/templates/blocks/bs_form_snippet.html | 2 -- ishtar_common/templates/ishtar/wizard/default_wizard.html | 2 +- ishtar_common/templates/ishtar/wizard/search.html | 4 +++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index bc9c8afbf..8f9d8686e 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -428,7 +428,7 @@ function get_label_from_input(input){ function update_search_resume(){ var summary = ""; - var inputs = $('#advanced-search-form input').map( + var inputs = $('#wizard-form input').map( function(){ var v = ""; var item_for_label = $(this); @@ -452,7 +452,7 @@ function update_search_resume(){ summary += get_label_from_input(item_for_label) + " " + v; } ).get(); - var selects = $('#advanced-search-form select').each( + var selects = $('#wizard-form select').each( function(){ $(this).find('option').not(':first').filter(':selected').map( function(){ @@ -478,7 +478,7 @@ function update_search_resume(){ function register_advanced_search(){ $(".advanced-search-reset").click( function(){ - document.getElementById('advanced-search-form').reset(); + document.getElementById('wizard-form').reset(); $('#advanced-search-resume').hide(); } ); diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html index bea4a8dc8..ed0dc14e1 100644 --- a/ishtar_common/templates/blocks/bs_form_snippet.html +++ b/ishtar_common/templates/blocks/bs_form_snippet.html @@ -64,7 +64,6 @@ -
-
{% endif %} diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index 144323854..a7a705f59 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -11,7 +11,7 @@ {% endblock %} {% block wizard_form %} -
{% csrf_token %} +{% csrf_token %}
{{ wizard.form.media }} {{ wizard.management_form }} diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html index da7955c26..e1f2433ea 100644 --- a/ishtar_common/templates/ishtar/wizard/search.html +++ b/ishtar_common/templates/ishtar/wizard/search.html @@ -15,7 +15,7 @@ {% endcomment %} - +{% csrf_token %} {% if wizard.form.forms %}
@@ -31,5 +31,7 @@ +
{% endif %} + {% endblock %} -- cgit v1.2.3