mirrors/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-15 14:41:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1665 from dalf/fix-paging

Browse source 
[fix] fix paging for the oscar theme after PR #1640
Close #1664
This commit is contained in:
Alexandre Flament 2019-08-02 20:38:53 +02:00 committed by GitHub
commit d24e7948eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
searx/search.py
View file

@ -279,6 +279,9 @@ def get_search_query_from_webapp(preferences, form):
query_timeout = raw_text_query.timeout_limit query_timeout = raw_text_query.timeout_limit
if query_timeout is None and 'timeout_limit' in form: if query_timeout is None and 'timeout_limit' in form:
raw_time_limit = form.get('timeout_limit') raw_time_limit = form.get('timeout_limit')
if raw_time_limit in ['None', '']:
raw_time_limit = None
else:
try: try:
query_timeout = float(raw_time_limit) query_timeout = float(raw_time_limit)
except ValueError: except ValueError:

2
searx/templates/oscar/results.html
View file

@ -5,7 +5,7 @@
<input type="hidden" name="pageno" value="{{ pageno }}" /> <input type="hidden" name="pageno" value="{{ pageno }}" />
<input type="hidden" name="time_range" value="{{ time_range }}" /> <input type="hidden" name="time_range" value="{{ time_range }}" />
<input type="hidden" name="language" value="{{ current_language }}" /> <input type="hidden" name="language" value="{{ current_language }}" />
<input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" /> {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" />{% endif %}
{%- endmacro %} {%- endmacro %}
{%- macro search_url() %}{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&amp;pageno={{ pageno }}{% endif %}{% if time_range %}&amp;time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&amp;language={{ current_language }}{% endif %}{% endmacro -%} {%- macro search_url() %}{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&amp;pageno={{ pageno }}{% endif %}{% if time_range %}&amp;time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&amp;language={{ current_language }}{% endif %}{% endmacro -%}