aboutsummaryrefslogtreecommitdiff
path: root/uploader
diff options
context:
space:
mode:
Diffstat (limited to 'uploader')
-rw-r--r--uploader/expression_data/dbinsert.py7
-rw-r--r--uploader/expression_data/views.py2
2 files changed, 4 insertions, 5 deletions
diff --git a/uploader/expression_data/dbinsert.py b/uploader/expression_data/dbinsert.py
index 2116031..b30f730 100644
--- a/uploader/expression_data/dbinsert.py
+++ b/uploader/expression_data/dbinsert.py
@@ -11,12 +11,11 @@ from flask import (
flash, request, url_for, Blueprint, redirect, render_template,
current_app as app)
+from uploader import jobs
from uploader.authorisation import require_login
from uploader.population.models import populations_by_species
+from uploader.species.models import all_species, species_by_id
from uploader.db_utils import with_db_connection, database_connection
-from uploader.species.models import species_by_id, all_species as species
-
-from . import jobs
dbinsertbp = Blueprint("dbinsert", __name__)
@@ -108,7 +107,7 @@ def select_platform():
return render_template(
"select_platform.html", filename=filename,
filetype=job["filetype"], totallines=int(job["currentline"]),
- default_species=default_species, species=species(conn),
+ default_species=default_species, species=all_species(conn),
genechips=gchips[default_species],
genechips_data=json.dumps(gchips))
return render_error(f"File '{filename}' no longer exists.")
diff --git a/uploader/expression_data/views.py b/uploader/expression_data/views.py
index 6900c51..c5a75e7 100644
--- a/uploader/expression_data/views.py
+++ b/uploader/expression_data/views.py
@@ -18,11 +18,11 @@ from flask import (flash,
from quality_control.errors import InvalidValue, DuplicateHeading
from uploader import jobs
+from uploader.datautils import order_by_family
from uploader.ui import make_template_renderer
from uploader.authorisation import require_login
from uploader.species.models import all_species, species_by_id
from uploader.db_utils import with_db_connection, database_connection
-from uploader.datautils import safe_int, order_by_family, enumerate_sequence
from uploader.population.models import (populations_by_species,
population_by_species_and_id)