From 7d5dba3e38892475edec80c922f06bcb40b0dcb3 Mon Sep 17 00:00:00 2001 From: zsloan Date: Thu, 4 Feb 2016 19:01:16 +0000 Subject: Most importantly, this commit fixes an issue that caused the trait page to not work because of the new dataset_menu_structure.json file An Intro section is also added to the header, though for the time being its contents aren't populated and the edit option isn't working --- genotype_files/new_genotypes/HSNIH.json | 3 --- genotype_files/new_genotypes/output.json | 3 --- wqflask/base/data_set.py | 2 +- wqflask/wqflask/templates/base.html | 3 +++ wqflask/wqflask/views.py | 5 +++++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/genotype_files/new_genotypes/HSNIH.json b/genotype_files/new_genotypes/HSNIH.json index fc8e42b3..e69de29b 100644 --- a/genotype_files/new_genotypes/HSNIH.json +++ b/genotype_files/new_genotypes/HSNIH.json @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -size 0 diff --git a/genotype_files/new_genotypes/output.json b/genotype_files/new_genotypes/output.json index fc8e42b3..e69de29b 100644 --- a/genotype_files/new_genotypes/output.json +++ b/genotype_files/new_genotypes/output.json @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -size 0 diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 5603fe2e..68a2a185 100755 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -91,7 +91,7 @@ class Dataset_Types(object): for dataset in data['datasets'][species][group][dataset_type]: #print("dataset is:", dataset) - short_dataset_name = dataset[0] + short_dataset_name = dataset[1] if dataset_type == "Phenotypes": new_type = "Publish" elif dataset_type == "Genotypes": diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index 4d44642b..24d959f4 100755 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -34,6 +34,9 @@