From ed0051e95ddf0315ae5de08c0c33e9f779e75b32 Mon Sep 17 00:00:00 2001 From: zsloan Date: Fri, 25 Oct 2019 17:38:43 -0500 Subject: Dropdowns now use family order ID so we can manually set the order of sets of groups --- wqflask/wqflask/api/gen_menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wqflask/wqflask/api/gen_menu.py b/wqflask/wqflask/api/gen_menu.py index 455cf15a..7d2d243c 100644 --- a/wqflask/wqflask/api/gen_menu.py +++ b/wqflask/wqflask/api/gen_menu.py @@ -76,7 +76,7 @@ def get_groups(species): WHERE Species.Name = '{}' AND InbredSet.SpeciesId = Species.Id GROUP by InbredSet.Name - ORDER BY IFNULL(InbredSet.Family, InbredSet.FullName) ASC, InbredSet.FullName ASC, InbredSet.MenuOrderId ASC""".format(species_name)).fetchall() + ORDER BY IFNULL(InbredSet.FamilyOrder, InbredSet.FullName) ASC, IFNULL(InbredSet.Family, InbredSet.FullName) ASC, InbredSet.FullName ASC, InbredSet.MenuOrderId ASC""".format(species_name)).fetchall() for result in results: family_name = "Family:" + str(result[2]) -- cgit v1.2.3