From 2fcf4d0343244936d6b066e85a1a06ebb33adf26 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 9 Nov 2021 19:29:52 +0000
Subject: Temporary fix to get temp trait submission working again; maybe
should be dealt with in GN3 in some way
---
wqflask/wqflask/show_trait/show_trait.py | 10 ++++++----
wqflask/wqflask/templates/show_trait_details.html | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index 6020bc16..678e3132 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -40,10 +40,15 @@ ONE_YEAR = 60 * 60 * 24 * 365
class ShowTrait:
def __init__(self, user_id, kw):
+ self.admin_status = None
if 'trait_id' in kw and kw['dataset'] != "Temp":
self.temp_trait = False
self.trait_id = kw['trait_id']
helper_functions.get_species_dataset_trait(self, kw)
+ self.admin_status = get_highest_user_access_role(
+ user_id=user_id,
+ resource_id=(self.resource_id or ""),
+ gn_proxy_url=GN_PROXY_URL)
elif 'group' in kw:
self.temp_trait = True
self.trait_id = "Temp_" + kw['species'] + "_" + kw['group'] + \
@@ -73,10 +78,7 @@ class ShowTrait:
self.trait_vals = Redis.get(self.trait_id).split()
self.resource_id = get_resource_id(self.dataset,
self.trait_id)
- self.admin_status = get_highest_user_access_role(
- user_id=user_id,
- resource_id=(self.resource_id or ""),
- gn_proxy_url=GN_PROXY_URL)
+
# ZS: Get verify/rna-seq link URLs
try:
blatsequence = self.this_trait.blatseq
diff --git a/wqflask/wqflask/templates/show_trait_details.html b/wqflask/wqflask/templates/show_trait_details.html
index 3e59a3ee..6b125221 100644
--- a/wqflask/wqflask/templates/show_trait_details.html
+++ b/wqflask/wqflask/templates/show_trait_details.html
@@ -234,7 +234,7 @@
{% endif %}
{% endif %}
- {% if admin_status.get('metadata', DataRole.VIEW) > DataRole.VIEW %}
+ {% if admin_status != None and admin_status.get('metadata', DataRole.VIEW) > DataRole.VIEW %}
{% if this_trait.dataset.type == 'Publish' %}
{% endif %}
--
cgit v1.2.3