1 files changed, 6 insertions, 5 deletions
diff --git a/wqflask/utility/authentication_tools.py b/wqflask/utility/authentication_tools.py
index 3553b92b..68bbb276 100644
--- a/wqflask/utility/authentication_tools.py
+++ b/wqflask/utility/authentication_tools.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function, division
-
 import json
 import requests
 
@@ -17,7 +15,7 @@ logger = logging.getLogger(__name__ )
 def check_resource_availability(dataset, trait_id=None):
 
     #At least for now assume temporary entered traits are accessible
-    if type(dataset) == str:
+    if isinstance(dataset, str):
         return webqtlConfig.DEFAULT_PRIVILEGES
     if dataset.type == "Temp":
         return webqtlConfig.DEFAULT_PRIVILEGES
@@ -51,7 +49,10 @@ def add_new_resource(dataset, trait_id=None):
     }
 
     if dataset.type == "Publish":
-        resource_ob['name'] = get_group_code(dataset) + "_" + str(trait_id)
+        group_code = get_group_code(dataset)
+        if group_code is None:
+            group_code = ""
+        resource_ob['name'] = group_code + "_" + str(trait_id)
         resource_ob['data'] = {
             'dataset': dataset.id,
             'trait'  : trait_id
@@ -87,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"