2 files changed, 18 insertions, 5 deletions
diff --git a/uploader/species/models.py b/uploader/species/models.py
index 51f941c..db53d48 100644
--- a/uploader/species/models.py
+++ b/uploader/species/models.py
@@ -58,7 +58,8 @@ def save_species(conn: mdb.Connection,
     common_name: The species' common name.
     scientific_name; The species' scientific name.
     """
-    genus, species_name = scientific_name.split(" ")
+    genus, *species_parts = scientific_name.split(" ")
+    species_name: str = " ".join(species_parts)
     families = species_families(conn)
     with conn.cursor() as cursor:
         cursor.execute("SELECT MAX(OrderId) FROM Species")
@@ -68,7 +69,7 @@ def save_species(conn: mdb.Connection,
             "menu_name": f"{common_name} ({genus[0]}. {species_name.lower()})",
             "scientific_name": scientific_name,
             "family": family,
-            "family_order": families[family],
+            "family_order": families.get(family, 999999),
             "taxon_id": taxon_id,
             "species_order": cursor.fetchone()[0] + 5
         }
@@ -116,7 +117,8 @@ def update_species(# pylint: disable=[too-many-arguments]
     species_order: The ordering of this species in relation to others
     """
     with conn.cursor(cursorclass=DictCursor) as cursor:
-        genus, species_name = scientific_name.split(" ")
+        genus, *species_parts = scientific_name.split(" ")
+        species_name = " ".join(species_parts)
         species = {
             "species_id": species_id,
             "common_name": common_name,
diff --git a/uploader/species/views.py b/uploader/species/views.py
index fee5c75..cea2f68 100644
--- a/uploader/species/views.py
+++ b/uploader/species/views.py
@@ -1,4 +1,5 @@
 """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,
@@ -62,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
@@ -79,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
 
@@ -113,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"]))