diff options
| author | Zachary Sloan | 2013-06-19 18:30:59 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2013-06-19 18:30:59 +0000 |
| commit | 2ebacd207ee9c65d9239626fc18d2c1a50e08fbc (patch) | |
| tree | 41627942dfce65608d376134ffb00a6765492676 /wqflask/utility | |
| parent | 0ce9a060640710b5a6e18f71b08d79e51ef71d8a (diff) | |
| parent | 25bd2fa7ac229eb7862fe778fe03eb75ff34368c (diff) | |
| download | genenetwork2-2ebacd207ee9c65d9239626fc18d2c1a50e08fbc.tar.gz | |
Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask
Conflicts:
wqflask/base/data_set.py
wqflask/wqflask/views.py
Fixed a couple conflicts to merge Lei's code related to the correlation page
Diffstat (limited to 'wqflask/utility')
| -rw-r--r-- | wqflask/utility/helper_functions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/utility/helper_functions.py b/wqflask/utility/helper_functions.py index 28242c27..d76a32ce 100644 --- a/wqflask/utility/helper_functions.py +++ b/wqflask/utility/helper_functions.py @@ -9,7 +9,7 @@ def get_species_dataset_trait(self, start_vars): #assert type(read_genotype) == type(bool()), "Expecting boolean value for read_genotype" self.dataset = data_set.create_dataset(start_vars['dataset']) self.species = TheSpecies(dataset=self.dataset) - self.this_trait = GeneralTrait(dataset=self.dataset.name, + self.this_trait = GeneralTrait(dataset=self.dataset, name=start_vars['trait_id'], cellid=None) |