From 51417c06061246bc92be89db198b3e74e7126035 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Sat, 20 Jun 2020 17:47:38 -0500
Subject: Fixed ports for proxy (though I need to add the port to global
 variables) and also simplified the check_owner_or_admin function a little

---
 wqflask/base/trait.py                             | 4 ++--
 wqflask/utility/authentication_tools.py           | 4 ++--
 wqflask/wqflask/show_trait/show_trait.py          | 3 ++-
 wqflask/wqflask/templates/show_trait_details.html | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index c2b8b910..0e26ca2c 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -382,9 +382,9 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
 
     resource_id = get_resource_id(dataset, trait.name)
     if dataset.type == 'Publish':
-        the_url = "http://localhost:8081/run-action?resource={}&user={}&branch=data&action=view".format(resource_id, g.user_session.user_id)
+        the_url = "http://localhost:8080/run-action?resource={}&user={}&branch=data&action=view".format(resource_id, g.user_session.user_id)
     else:
-        the_url = "http://localhost:8081/run-action?resource={}&user={}&branch=data&action=view&trait={}".format(resource_id, g.user_session.user_id, trait.name)
+        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":
diff --git a/wqflask/utility/authentication_tools.py b/wqflask/utility/authentication_tools.py
index 6c88949b..06b2854a 100644
--- a/wqflask/utility/authentication_tools.py
+++ b/wqflask/utility/authentication_tools.py
@@ -35,7 +35,7 @@ def check_resource_availability(dataset, trait_id=None):
     else:
         return response #ZS: Need to substitute in something that creates the resource in Redis later
 
-    the_url = "http://localhost:8081/available?resource={}&user={}".format(resource_id, g.user_session.user_id)
+    the_url = "http://localhost:8080/available?resource={}&user={}".format(resource_id, g.user_session.user_id)
     try:
         response = json.loads(requests.get(the_url).content)
     except:
@@ -47,7 +47,7 @@ def check_resource_availability(dataset, trait_id=None):
         return False
 
 def check_admin(resource_id=None):
-    the_url = "http://localhost:8081/available?resource={}&user={}".format(resource_id, g.user_session.user_id)
+    the_url = "http://localhost:8080/available?resource={}&user={}".format(resource_id, g.user_session.user_id)
     try:
         response = json.loads(requests.get(the_url).content)['admin']
     except:
diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index ed4ff0ad..4698807a 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -72,7 +72,8 @@ class ShowTrait(object):
                                            cellid=None)
             self.trait_vals = Redis.get(self.trait_id).split()
 
-        self.admin_status = check_owner_or_admin(self.dataset, self.trait_id)
+        self.resource_id = get_resource_id(self.dataset, self.trait_id)
+        self.admin_status = check_owner_or_admin(resource_id=self.resource_id)
 
         #ZS: Get verify/rna-seq link URLs
         try:
diff --git a/wqflask/wqflask/templates/show_trait_details.html b/wqflask/wqflask/templates/show_trait_details.html
index 5e0bae79..965c0340 100644
--- a/wqflask/wqflask/templates/show_trait_details.html
+++ b/wqflask/wqflask/templates/show_trait_details.html
@@ -248,8 +248,8 @@
         <a target="_blank" href="http://gn1.genenetwork.org/webqtl/main.py?cmd=show&db={{ this_trait.dataset.name }}&probeset={{ this_trait.name }}">
         <button type="button" id="view_in_gn1" class="btn btn-primary" title="View Trait in GN1">View in GN1</button>
         </a>
-        {% if admin_status[1] == "owner" or admin_status[1] == "edit-admins" or admin_status[1] == "edit-access" %}
-        <a target="_blank" href="./resources/manage?resource_id={{ admin_status[0] }}">
+        {% if admin_status == "owner" or admin_status == "edit-admins" or admin_status == "edit-access" %}
+        <a target="_blank" href="./resources/manage?resource_id={{ resource_id }}">
             <button type="button" id="edit_resource" class="btn btn-success" title="Edit Resource">Edit</button>
         </a>
         {% endif %}
-- 
cgit v1.2.3