d24e794 · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #1665 from dalf/fix-paging

[fix] fix paging for the oscar theme after PR #1640 Close #1664

commitd24e7948ebd8aaa25a1907c225e1d2d3de37c17c authorAlexandre Flament <alex@al-f.net> dateFri 2 Aug 2019, 20:38 (7 years ago) parent72029d2 ba80a0b

2 files changed+8−5

compare with master

unifiedsplit

searx/search.py+7−4 searx/templates/oscar/results.html+1−1

searx/search.py+7−4

@@ -279,10 +279,13 @@ def get_search_query_from_webapp(preferences, form):

279279 query_timeout = raw_text_query.timeout_limit

280280 if query_timeout is None and 'timeout_limit' in form:

281281 raw_time_limit = form.get('timeout_limit')

282− try:

283− query_timeout = float(raw_time_limit)

284− except ValueError:

285− raise SearxParameterException('timeout_limit', raw_time_limit)

282+ if raw_time_limit in ['None', '']:

283+ raw_time_limit = None

284+ else:

285+ try:

286+ query_timeout = float(raw_time_limit)

287+ except ValueError:

288+ raise SearxParameterException('timeout_limit', raw_time_limit)

286289

287290 # query_categories

288291 query_categories = []

searx/templates/oscar/results.html+1−1

@@ -5,7 +5,7 @@

55 <input type="hidden" name="pageno" value="{{ pageno }}" />

66 <input type="hidden" name="time_range" value="{{ time_range }}" />

77 <input type="hidden" name="language" value="{{ current_language }}" />

8− <input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" />

8+ {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" />{% endif %}

99{%- endmacro %}

1010{%- macro search_url() %}{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if time_range %}&time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&language={{ current_language }}{% endif %}{% endmacro -%}

1111