Merge pull request #411 from pjotrp/testing

Updating docs

11 files changed, 4 insertions, 3 deletions

diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index 3d86bc22..862ac881 100644
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -85,7 +85,7 @@ assert_writable_dir(GENERATED_TEXT_DIR)
 # Flat file directories
 GENODIR              = flat_files('genotype')+'/'
 assert_dir(GENODIR)
-assert_dir(GENODIR+'bimbam') # for gemma
+# assert_dir(GENODIR+'bimbam') # for gemma
 
 # JSON genotypes are OBSOLETE
 JSON_GENODIR         = flat_files('genotype/json')+'/'
diff --git a/wqflask/utility/authentication_tools.py b/wqflask/utility/authentication_tools.py
index ed7462d1..9a2a5ccd 100644
--- a/wqflask/utility/authentication_tools.py
+++ b/wqflask/utility/authentication_tools.py
@@ -45,7 +45,7 @@ def check_resource_availability(dataset, trait_id=None):
 
 def add_new_resource(dataset, trait_id=None):
     resource_ob = {
-        'owner_id'    : webqtlConfig.DEFAULT_OWNER_ID,
+        'owner_id'    : "none", # webqtlConfig.DEFAULT_OWNER_ID,
         'default_mask': webqtlConfig.DEFAULT_PRIVILEGES,
         'group_masks' : {}
     }
@@ -84,6 +84,7 @@ def check_admin(resource_id=None):
     try:
         response = json.loads(requests.get(the_url).content)['admin']
     except:
+        logger.debug(resource_info)
         response = resource_info['default_mask']['admin']
 
     if 'edit-admins' in response:
@@ -124,4 +125,4 @@ def check_owner_or_admin(dataset=None, trait_id=None, resource_id=None):
         else:
             return check_admin(resource_id)
 
-    return "not-admin"
\ No newline at end of file
+    return "not-admin"
diff --git a/wqflask/wqflask/static/gif/error/m001.gif b/wqflask/wqflask/static/gif/error/m001.gif
new file mode 100644
index 00000000..81c8ba26
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m001.gif
diff --git a/wqflask/wqflask/static/gif/error/m002.gif b/wqflask/wqflask/static/gif/error/m002.gif
new file mode 100644
index 00000000..7232c58b
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m002.gif
diff --git a/wqflask/wqflask/static/gif/error/m003.gif b/wqflask/wqflask/static/gif/error/m003.gif
new file mode 100644
index 00000000..2384ceb6
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m003.gif
diff --git a/wqflask/wqflask/static/gif/error/m004.gif b/wqflask/wqflask/static/gif/error/m004.gif
new file mode 100644
index 00000000..d77c708d
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m004.gif
diff --git a/wqflask/wqflask/static/gif/error/m005.gif b/wqflask/wqflask/static/gif/error/m005.gif
new file mode 100644
index 00000000..1b2de7ec
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m005.gif
diff --git a/wqflask/wqflask/static/gif/error/m006.gif b/wqflask/wqflask/static/gif/error/m006.gif
new file mode 100644
index 00000000..f354a4cc
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m006.gif
diff --git a/wqflask/wqflask/static/gif/error/m007.gif b/wqflask/wqflask/static/gif/error/m007.gif
new file mode 100644
index 00000000..ba2eeb37
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m007.gif
diff --git a/wqflask/wqflask/static/gif/error/m008.gif b/wqflask/wqflask/static/gif/error/m008.gif
new file mode 100644
index 00000000..4cdec5cb
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/m008.gif
diff --git a/wqflask/wqflask/static/gif/error/mouse-wheel.gif b/wqflask/wqflask/static/gif/error/mouse-wheel.gif
new file mode 100644
index 00000000..164220e7
--- /dev/null
+++ b/wqflask/wqflask/static/gif/error/mouse-wheel.gif