diff options
| author | BonfaceKilz | 2020-09-28 18:04:15 +0300 |
|---|---|---|
| committer | BonfaceKilz | 2020-09-28 18:04:15 +0300 |
| commit | 367de7d8bd822a80cdc035a219b814f0b268b65f (patch) | |
| tree | a6730cb87848e6ec38fb7276bcae33e4b8d52ad7 /wqflask | |
| parent | bbcecf8e7d8389b8466fe51dde6538387fdce6b5 (diff) | |
| parent | a8c983a69b12ff32a30d488d7f326915f1aa7d63 (diff) | |
| download | genenetwork2-367de7d8bd822a80cdc035a219b814f0b268b65f.tar.gz | |
Merge branch 'testing' into build/python3-migration
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/base/trait.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index c37a8325..de03273d 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -532,14 +532,15 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False): description_string = trait.description target_string = trait.probe_target_description - if len(description_string) > 1 and description_string != 'None': + if str(description_string or "") != "" and description_string != 'None': description_display = description_string else: description_display = trait.symbol - if (len(description_display) > 1 and description_display != 'N/A' and - len(str(target_string)) > 1 and target_string != 'None'): - description_display = description_display + '; ' + str(target_string).strip() + if (str(description_display or "") != "" and + description_display != 'N/A' and + str(target_string or "") != "" and target_string != 'None'): + description_display = description_display + '; ' + target_string.strip() # Save it for the jinja2 template trait.description_display = description_display |