Added some admin functionality and fixed issue with temp traits

2 files changed, 17 insertions, 9 deletions

diff --git a/wqflask/wqflask/resource_manager.py b/wqflask/wqflask/resource_manager.py
index 0f9f5c9d..39a07310 100644
--- a/wqflask/wqflask/resource_manager.py
+++ b/wqflask/wqflask/resource_manager.py
@@ -18,7 +18,7 @@ def manage_resource():
     params = request.form if request.form else request.args
     if 'resource_id' in request.args:
         resource_id = request.args['resource_id']
-        admin_status = check_owner_or_admin(resource_id=resource_id)[1]
+        admin_status = check_owner_or_admin(resource_id=resource_id)
 
         resource_info = get_resource_info(resource_id)
         group_masks = resource_info['group_masks']
@@ -67,7 +67,7 @@ def search_for_groups():
 def change_owner():
     resource_id = request.form['resource_id']
     if 'new_owner' in request.form:
-        admin_status = check_owner_or_admin(resource_id=resource_id)[1]
+        admin_status = check_owner_or_admin(resource_id=resource_id)
         if admin_status == "owner":
             new_owner_id = request.form['new_owner']
             change_resource_owner(resource_id, new_owner_id)
@@ -100,7 +100,7 @@ def change_default_privileges():
 @app.route("/resources/add_group", methods=('POST',))
 def add_group_to_resource():
     resource_id = request.form['resource_id']
-    admin_status = check_owner_or_admin(resource_id=resource_id)[1]
+    admin_status = check_owner_or_admin(resource_id=resource_id)
     if admin_status == "owner" or admin_status == "edit-admins" or admin_status == "edit-access":
         if 'selected_group' in request.form:
             group_id = request.form['selected_group']
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index dc431aa9..bc01839b 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -96,13 +96,21 @@ def check_access_permissions():
             pass
     else:
         if 'dataset' in request.args:
-            dataset = create_dataset(request.args['dataset'])
-            if 'trait_id' in request.args:
-                available = check_resource_availability(dataset, request.args['trait_id'])
+            if request.args['dataset'] == "Temp":
+                permissions = check_resource_availability("Temp")
             else:
-                available = check_resource_availability(dataset)
-
-            if available == "no-access":
+                dataset = create_dataset(request.args['dataset'])
+
+                if dataset.type == "Temp":
+                    permissions = False
+                if 'trait_id' in request.args:
+                    permissions = check_resource_availability(dataset, request.args['trait_id'])
+                elif dataset.type != "Publish":
+                    permissions = check_resource_availability(dataset)
+                else:
+                    return None
+
+            if 'view' not in permissions['data']:
                 return redirect(url_for("no_access_page"))
 
 @app.teardown_appcontext