diff options
| author | zsloan | 2016-02-04 19:01:16 +0000 |
|---|---|---|
| committer | zsloan | 2016-02-04 19:01:16 +0000 |
| commit | 7d5dba3e38892475edec80c922f06bcb40b0dcb3 (patch) | |
| tree | 0e6857251bf4a805c3c5c8ba4651a72b0ad89de4 | |
| parent | d8beaebcc8e6a2d9a0ed16c479aeb8cb58989156 (diff) | |
| download | genenetwork2-7d5dba3e38892475edec80c922f06bcb40b0dcb3.tar.gz | |
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
| -rw-r--r-- | genotype_files/new_genotypes/HSNIH.json | 3 | ||||
| -rw-r--r-- | genotype_files/new_genotypes/output.json | 3 | ||||
| -rwxr-xr-x | wqflask/base/data_set.py | 2 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/base.html | 3 | ||||
| -rwxr-xr-x | 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 @@ -35,6 +35,9 @@ <div> <ul class="nav navbar-nav"> <li class=""> + <a href="/intro">Intro</a> + </li> + <li class=""> <a href="/">Search</a> </li> <li class=""> diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index aa303e97..89b7ba43 100755 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -201,6 +201,11 @@ def references(): doc = docs.Docs("references") return render_template("docs.html", **doc.__dict__) +@app.route("/intro") +def intro(): + doc = docs.Docs("intro") + return render_template("docs.html", **doc.__dict__) + @app.route("/policies") def policies(): doc = docs.Docs("policies") |