diff options
| author | Noémi Ványi <kvch@users.noreply.github.com> | 2019-10-24 13:18:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 13:18:51 +0200 |
| commit | 4e029b023a27580f8ae443645a8ae45b30f5f747 (patch) | |
| tree | eb52588de5035f1fae9dacbdc22b719a0df3afac | |
| parent | 147ad504c340727b77b1e23568a29c1daef0df8b (diff) | |
| parent | bf24b39fce4601717c47bf557c181fa6a3851e7d (diff) | |
| download | searxng-4e029b023a27580f8ae443645a8ae45b30f5f747.tar.gz searxng-4e029b023a27580f8ae443645a8ae45b30f5f747.zip | |
Merge pull request #1728 from MarcAbonce/corrections_fix
[fix] Preserve bangs in corrections
| -rw-r--r-- | searx/templates/oscar/results.html | 4 | ||||
| -rw-r--r-- | searx/templates/simple/results.html | 4 | ||||
| -rw-r--r-- | searx/webapp.py | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 9a95265b9..fce7f97d6 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -22,8 +22,8 @@ <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span>
{% for correction in corrections %}
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">
- <input type="hidden" name="q" value="{{ query_prefix + correction }}">
- <button type="submit" class="btn btn-default btn-xs">{{ correction }}</button>
+ <input type="hidden" name="q" value="{{ correction.url }}">
+ <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>
</form>
{% endfor %}
</div>
diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html index 770eebe81..8885abc30 100644 --- a/searx/templates/simple/results.html +++ b/searx/templates/simple/results.html @@ -95,13 +95,13 @@ {% for correction in corrections %} <div class="left"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation"> - <input type="hidden" name="q" value="{{ correction }}"> + <input type="hidden" name="q" value="{{ correction.url }}"> <input type="hidden" name="time_range" value="{{ time_range }}"> <input type="hidden" name="language" value="{{ current_language }}"> <input type="hidden" name="safesearch" value="{{ safesearch }}"> <input type="hidden" name="theme" value="{{ theme }}"> {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" >{% endif %} - <input type="submit" value="{{ correction }}"> + <input type="submit" value="{{ correction.title }}"> </form> </div> {% endfor %} diff --git a/searx/webapp.py b/searx/webapp.py index 505e93aea..3bb29140a 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -610,6 +610,12 @@ def index(): 'title': suggestion }, result_container.suggestions) + + correction_urls = list(map(lambda correction: { + 'url': raw_text_query.changeSearchQuery(correction).getFullQuery(), + 'title': correction + }, + result_container.corrections)) # return render( 'results.html', @@ -622,7 +628,7 @@ def index(): advanced_search=advanced_search, suggestions=suggestion_urls, answers=result_container.answers, - corrections=result_container.corrections, + corrections=correction_urls, infoboxes=result_container.infoboxes, paging=result_container.paging, unresponsive_engines=result_container.unresponsive_engines, |