From 9b1dd2f67d51de2d6cdb687ee332597ba010a0ac Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sat, 25 Jul 2020 11:54:10 +0100 Subject: Removing bimbam check. We'll get rid of bimbam anyway. --- wqflask/base/webqtlConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wqflask') 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')+'/' -- cgit v1.2.3 From 869e3a2d7f1ef0a44cc90612a46b02d7b01bab88 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sat, 25 Jul 2020 13:35:02 +0100 Subject: Animated gifs --- wqflask/wqflask/static/gif/error/m001.gif | Bin 0 -> 273531 bytes wqflask/wqflask/static/gif/error/m002.gif | Bin 0 -> 1799777 bytes wqflask/wqflask/static/gif/error/m003.gif | Bin 0 -> 2238947 bytes wqflask/wqflask/static/gif/error/m004.gif | Bin 0 -> 2090274 bytes wqflask/wqflask/static/gif/error/m005.gif | Bin 0 -> 947565 bytes wqflask/wqflask/static/gif/error/m006.gif | Bin 0 -> 121116 bytes wqflask/wqflask/static/gif/error/m007.gif | Bin 0 -> 41670 bytes wqflask/wqflask/static/gif/error/m008.gif | Bin 0 -> 732023 bytes wqflask/wqflask/static/gif/error/mouse-wheel.gif | Bin 0 -> 2001764 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 wqflask/wqflask/static/gif/error/m001.gif create mode 100644 wqflask/wqflask/static/gif/error/m002.gif create mode 100644 wqflask/wqflask/static/gif/error/m003.gif create mode 100644 wqflask/wqflask/static/gif/error/m004.gif create mode 100644 wqflask/wqflask/static/gif/error/m005.gif create mode 100644 wqflask/wqflask/static/gif/error/m006.gif create mode 100644 wqflask/wqflask/static/gif/error/m007.gif create mode 100644 wqflask/wqflask/static/gif/error/m008.gif create mode 100644 wqflask/wqflask/static/gif/error/mouse-wheel.gif (limited to 'wqflask') 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m001.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m002.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m003.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m004.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m005.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m006.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m007.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/m008.gif differ 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 Binary files /dev/null and b/wqflask/wqflask/static/gif/error/mouse-wheel.gif differ -- cgit v1.2.3 From 91e52482071ce90acf3607597de2ae79e298fd67 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sat, 25 Jul 2020 16:25:14 +0100 Subject: The variable is never defined, so let's default to "none" --- wqflask/utility/authentication_tools.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wqflask') 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" -- cgit v1.2.3