aboutsummaryrefslogtreecommitdiff
path: root/qc_app
diff options
context:
space:
mode:
Diffstat (limited to 'qc_app')
-rw-r--r--qc_app/entry.py7
-rw-r--r--qc_app/templates/index.html8
2 files changed, 7 insertions, 8 deletions
diff --git a/qc_app/entry.py b/qc_app/entry.py
index d23a45a..f2db878 100644
--- a/qc_app/entry.py
+++ b/qc_app/entry.py
@@ -100,7 +100,7 @@ def upload_file():
request_errors = errors(request)
if request_errors:
for error in request_errors:
- flash(error, "alert-error error-expr-data")
+ flash(error, "alert-danger error-expr-data")
return redirect(url_for("entry.upload_file"))
filename = secure_filename(request.files["qc_text_file"].filename)
@@ -113,9 +113,8 @@ def upload_file():
zip_errors = zip_file_errors(filepath, upload_dir)
if zip_errors:
for error in zip_errors:
- flash(error, "alert-error error-expr-data")
- return render_template(
- "index.html", species=with_db_connection(species)), 400
+ flash(error, "alert-danger error-expr-data")
+ return redirect(url_for("entry.upload_file"))
return redirect(url_for("parse.parse",
speciesid=request.form["speciesid"],
diff --git a/qc_app/templates/index.html b/qc_app/templates/index.html
index 997c1e5..e23dde1 100644
--- a/qc_app/templates/index.html
+++ b/qc_app/templates/index.html
@@ -26,7 +26,7 @@
<p>The R/qtl2 bundle, additionally, can contain extra metadata, that neither
of the methods below can handle.</p>
- <a href={{url_for("upload.rqtl2.select_species")}}
+ <a href="{{url_for('upload.rqtl2.select_species')}}"
title="Upload a zip bundle of R/qtl2 files">
<button class="btn btn-primary">upload R/qtl2 bundle</button></a>
</div>
@@ -60,9 +60,9 @@
</ol>
</div>
- <a href={{url_for("entry.upload_file")}}
+ <a href="{{url_for('entry.upload_file')}}"
title="Upload your expression data"
- class="btn btn-primary">upload Samples/Cases</a>
+ class="btn btn-primary">upload expression data</a>
</div>
<div class="row">
@@ -75,7 +75,7 @@
<p>This section gives you the opportunity to upload any missing samples</p>
</div>
- <a href={{url_for("samples.select_species")}}
+ <a href="{{url_for('samples.select_species')}}"
title="Upload samples/cases/individuals for your data"
class="btn btn-primary">upload Samples/Cases</a>
</div>