From 645c07b98aae9508e8a0aeedd8eaca815d5daf54 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 24 Jun 2020 17:13:45 -0500
Subject: Temporary partial fix to issue of resources without info; need to add
 something that automatically inserts resources with default privileges

---
 wqflask/base/trait.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 0e26ca2c..7fc016f3 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -386,13 +386,6 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
     else:
         the_url = "http://localhost:8080/run-action?resource={}&user={}&branch=data&action=view&trait={}".format(resource_id, g.user_session.user_id, trait.name)
 
-    response = requests.get(the_url).content
-    if response.strip() == "no-access":
-        trait.view = False
-        return trait
-    else:
-        trait_info = json.loads(response)
-
     try:
         response = requests.get(the_url).content
         if response.strip() == "no-access":
@@ -402,7 +395,10 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
             trait_info = json.loads(response)
     except:
         resource_info = get_resource_info(resource_id)
-        default_permissions = resource_info['default_mask']['data']
+        if resource_info:
+            default_permissions = resource_info['default_mask']['data']
+        else:
+            default_permissions = webqtlConfig.DEFAULT_PRIVILEGES
         if 'view' not in default_permissions:
             trait.view = False
             return trait
-- 
cgit 1.4.1