sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-26 16:00:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix file path management and download bugs

Browse Source
This commit is contained in:
Patrick Jentsch
2020-12-02 14:26:17 +01:00
parent 9dde839148
commit 4c92fdfb6c
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/app/corpora/views.py
View File

@ -234,7 +234,7 @@ def download_corpus_file(corpus_id, corpus_file_id):
or current_user.is_administrator()):
abort(403)
return send_from_directory(as_attachment=True,
directory=corpus_file.corpus.path,
directory=os.path.dirname(corpus_file.path),
filename=corpus_file.filename)
@ -382,8 +382,7 @@ def inspect_query_result(query_result_id):
inspect_display_options_form = InspectDisplayOptionsForm(
prefix='inspect-display-options-form'
)
query_result_file_path = os.path.join(query_result.path, query_result.filename) # noqa
with open(query_result_file_path, 'r') as query_result_file:
with open(query_result.path, 'r') as query_result_file:
query_result_file_content = json.load(query_result_file)
return render_template('corpora/query_results/inspect.html.j2',
query_result=query_result,
@ -413,5 +412,6 @@ def download_query_result(query_result_id):
if not (query_result.creator == current_user
or current_user.is_administrator()):
abort(403)
return send_from_directory(as_attachment=True, directory=query_result.path,
return send_from_directory(as_attachment=True,
directory=os.path.dirname(query_result.path),
filename=query_result.filename)