diff options
| author | Alexander Kabui | 2021-10-13 08:28:16 +0300 |
|---|---|---|
| committer | Alexander Kabui | 2021-10-13 08:28:16 +0300 |
| commit | 5f855ab3c605201175482591073a10692516fd5c (patch) | |
| tree | 4ae1dc86a467ea3b7e3b23519b8875fa0da0548f /wqflask/base/trait.py | |
| parent | db9225caf0a78b13af1892d47c69463e00262d03 (diff) | |
| parent | a212ad123f902b6a9c74bcac1d98bc274cebbdda (diff) | |
| download | genenetwork2-5f855ab3c605201175482591073a10692516fd5c.tar.gz | |
resolve merge conflict
Diffstat (limited to 'wqflask/base/trait.py')
| -rw-r--r-- | wqflask/base/trait.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 10851e00..96a09302 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -27,11 +27,13 @@ def create_trait(**kw): assert bool(kw.get('name')), "Needs trait name" - if kw.get('dataset_name'): + if bool(kw.get('dataset')): + dataset = kw.get('dataset') + else: if kw.get('dataset_name') != "Temp": dataset = create_dataset(kw.get('dataset_name')) - else: - dataset = kw.get('dataset') + else: + dataset = create_dataset("Temp", group_name=kw.get('group_name')) if dataset.type == 'Publish': permissions = check_resource_availability( |