Merge branch 'testing' into build/python3-migration

1 files changed, 5 insertions, 2 deletions

diff --git a/wqflask/utility/authentication_tools.py b/wqflask/utility/authentication_tools.py
index 73c39399..68bbb276 100644
--- a/wqflask/utility/authentication_tools.py
+++ b/wqflask/utility/authentication_tools.py
@@ -77,7 +77,10 @@ def add_new_resource(dataset, trait_id=None):
 
 def get_group_code(dataset):
     results = g.db.execute("SELECT InbredSetCode from InbredSet where Name='{}'".format(dataset.group.name)).fetchone()
-    return results[0]
+    if results[0]:
+        return results[0]
+    else:
+        return ""
 
 def check_admin(resource_id=None):
     the_url = "http://localhost:8080/available?resource={}&user={}".format(resource_id, g.user_session.user_id)
@@ -85,7 +88,7 @@ def check_admin(resource_id=None):
         response = json.loads(requests.get(the_url).content)['admin']
     except:
         resource_info = get_resource_info(resource_id)
-        response = resource_info['default_mask']['admin']
+l        response = resource_info['default_mask']['admin']
 
     if 'edit-admins' in response:
         return "edit-admins"