diff options
| author | Lei Yan | 2016-02-25 16:42:15 +0000 |
|---|---|---|
| committer | Lei Yan | 2016-02-25 16:42:15 +0000 |
| commit | e55f38a72d47fbdf5f652a08e8da1db78f1dcdb5 (patch) | |
| tree | 68161b76858cf72f7a7b5576de6384042e214d8e /wqflask/base | |
| parent | 7263c52a7d903a2dbdd5d05411821ec960961b4d (diff) | |
| parent | ece60a2d25ed71980121ac1c1854c3ab3514f453 (diff) | |
| download | genenetwork2-e55f38a72d47fbdf5f652a08e8da1db78f1dcdb5.tar.gz | |
Merge /home/zas1024/gene
Diffstat (limited to 'wqflask/base')
| -rwxr-xr-x | wqflask/base/data_set.py | 2 | ||||
| -rwxr-xr-x | wqflask/base/webqtlConfig.py | 2 |
2 files changed, 2 insertions, 2 deletions
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/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py index 330fec56..3eaeb56e 100755 --- a/wqflask/base/webqtlConfig.py +++ b/wqflask/base/webqtlConfig.py @@ -55,7 +55,7 @@ COMMON_LIB = GNROOT + 'support/admin' HTMLPATH = GNROOT + 'genotype_files/' PYLMM_PATH = '/home/zas1024/plink_gemma/' SNP_PATH = '/home/zas1024/snps/' -IMGDIR = GNROOT + '/wqflask/wqflask/images/' +IMGDIR = GNROOT + '/wqflask/wqflask/static/output/' IMAGESPATH = HTMLPATH + 'images/' UPLOADPATH = IMAGESPATH + 'upload/' TMPDIR = '/home/zas1024/tmp/' # Will remove this and dependent items later |