diff options
| author | Lei Yan | 2013-06-19 21:08:43 +0000 |
|---|---|---|
| committer | Lei Yan | 2013-06-19 21:08:43 +0000 |
| commit | 0dd5dfb3925b2198487480d6093eed0d92201fc6 (patch) | |
| tree | cc103e4067d42442b0d86602f104a406d172945d /wqflask/base/trait.py | |
| parent | 71f1a5d52d58d07294ef3f2cfa87026025358e74 (diff) | |
| parent | aac1dd2f9c5b216b24c6e35676ba5d50f9d5d3c2 (diff) | |
| download | genenetwork2-0dd5dfb3925b2198487480d6093eed0d92201fc6.tar.gz | |
Merge branch 'flask' of git://github.com/zsloan/genenetwork into flask
Conflicts:
wqflask/base/data_set.py
Diffstat (limited to 'wqflask/base/trait.py')
| -rwxr-xr-x | wqflask/base/trait.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 82e013ae..38b3a625 100755 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -319,7 +319,7 @@ class GeneralTrait(object): #XZ: assign SQL query result to trait attributes. for i, field in enumerate(self.dataset.display_fields): - setattr(self, field, traitInfo[i]) + setattr(self, field, str(traitInfo[i])) if self.dataset.type == 'Publish': self.confidential = 0 |