1 files changed, 17 insertions, 3 deletions
diff --git a/uploader/species/views.py b/uploader/species/views.py
index 08d3728..cea2f68 100644
--- a/uploader/species/views.py
+++ b/uploader/species/views.py
@@ -1,5 +1,7 @@
 """Endpoints handling species."""
+from markupsafe import escape
 from pymonad.either import Left, Right, Either
+from gn_libs.mysqldb import database_connection
 from flask import (flash,
                    request,
                    url_for,
@@ -8,8 +10,8 @@ from flask import (flash,
                    current_app as app)
 
 from uploader.population import popbp
+from uploader.platforms import platformsbp
 from uploader.ui import make_template_renderer
-from uploader.db_utils import database_connection
 from uploader.oauth2.client import oauth2_get, oauth2_post
 from uploader.authorisation import require_login, require_token
 from uploader.datautils import order_by_family, enumerate_sequence
@@ -23,10 +25,12 @@ from .models import (all_species,
 
 speciesbp = Blueprint("species", __name__)
 speciesbp.register_blueprint(popbp, url_prefix="/")
+speciesbp.register_blueprint(platformsbp, url_prefix="/")
 render_template = make_template_renderer("species")
 
 
 @speciesbp.route("/", methods=["GET"])
+@require_login
 def list_species():
     """List and display all the species in the database."""
     with database_connection(app.config["SQL_URI"]) as conn:
@@ -59,6 +63,8 @@ def create_species():
         if request.method == "GET":
             return render_template("species/create-species.html",
                                    families=species_families(conn),
+                                   return_to=(
+                                       request.args.get("return_to") or ""),
                                    activelink="create-species")
 
         error = False
@@ -76,7 +82,7 @@ def create_species():
             error = True
 
         parts = tuple(name.strip() for name in scientific_name.split(" "))
-        if len(parts) != 2 or not all(bool(name) for name in parts):
+        if (len(parts) != 2 and len(parts) != 3) or not all(bool(name) for name in parts):
             flash("The scientific name you provided is invalid.", "alert-danger")
             error = True
 
@@ -110,7 +116,15 @@ def create_species():
 
         species = save_species(
             conn, common_name, scientific_name, family, taxon_id)
-        flash("Species saved successfully!", "alert-success")
+        flash(
+            f"You have successfully added species "
+            f"'{escape(species['scientific_name'])} "
+            f"({escape(species['common_name'])})'.",
+            "alert-success")
+
+        return_to = request.form.get("return_to").strip()
+        if return_to:
+            return redirect(url_for(return_to, species_id=species["species_id"]))
         return redirect(url_for("species.view_species", species_id=species["species_id"]))