From 633973e33de6a989d3fc7710002b5659a8857bb8 Mon Sep 17 00:00:00 2001 From: zsloan Date: Sat, 6 Jul 2019 12:06:18 -0500 Subject: Fixed issue where spaces were inserted into descriptions for mRNA expression data in the regular search Created default collection name when the user submits a collection without naming it --- wqflask/wqflask/collect.py | 2 ++ wqflask/wqflask/search_results.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wqflask/wqflask/collect.py b/wqflask/wqflask/collect.py index 74013239..7e3337a0 100644 --- a/wqflask/wqflask/collect.py +++ b/wqflask/wqflask/collect.py @@ -214,6 +214,8 @@ def collections_new(): if "create_new" in params: logger.debug("in create_new") collection_name = params['new_collection'] + if collection_name.strip() == "": + collection_name = datetime.datetime.utcnow().strftime('Collection_%b_%d_%H:%M') return create_new(collection_name) elif "add_to_existing" in params: logger.debug("in add to existing") diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py index 12a69bc3..278bf930 100644 --- a/wqflask/wqflask/search_results.py +++ b/wqflask/wqflask/search_results.py @@ -112,7 +112,7 @@ views.py). trait_dict['hmac'] = user_manager.data_hmac('{}:{}'.format(this_trait.name, this_trait.dataset.name)) if this_trait.dataset.type == "ProbeSet": trait_dict['symbol'] = this_trait.symbol - trait_dict['description'] = insert_newlines(this_trait.description_display) + trait_dict['description'] = this_trait.description_display trait_dict['location'] = this_trait.location_repr trait_dict['mean'] = "N/A" trait_dict['additive'] = "N/A" -- cgit v1.2.3