Merge pull request #2300 from dalf/fix-webapp-index

[fix] fix of / and /search
This commit is contained in:
Alexandre Flament 2020-11-14 13:23:03 +01:00 committed by GitHub
commit ebed1461bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 4 deletions

View file

@ -547,10 +547,12 @@ def index():
# redirect to search if there's a query in the request
if request.form.get('q'):
return redirect(url_for('search'), 308)
query = ('?' + request.query_string.decode()) if request.query_string else ''
return redirect(url_for('search') + query, 308)
return render(
'index.html',
selected_categories=get_selected_categories(request.preferences, request.form),
)
@ -566,8 +568,8 @@ def search():
if output_format not in ['html', 'csv', 'json', 'rss']:
output_format = 'html'
# check if there is query
if request.form.get('q') is None:
# check if there is query (not None and not an empty string)
if not request.form.get('q'):
if output_format == 'html':
return render(
'index.html',