From d7de19b072745ab96a68428281e186cd4c755e45 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Tue, 13 Feb 2018 23:28:24 +0100 Subject: [PATCH 1/3] fix toolbox filters --- lib/galaxy/tools/toolbox/filters/__init__.py | 2 +- lib/galaxy/webapps/galaxy/api/users.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/tools/toolbox/filters/__init__.py b/lib/galaxy/tools/toolbox/filters/__init__.py index 43710bdcaf0..59ec37d67ee 100644 --- a/lib/galaxy/tools/toolbox/filters/__init__.py +++ b/lib/galaxy/tools/toolbox/filters/__init__.py @@ -44,7 +44,7 @@ class FilterFactory(object): elif name == 'toolbox_label_filters': category = "label" if category: - validate = getattr(trans.app.config, 'user_%s_filters' % category, []) + validate = getattr(trans.app.config, 'user_tools_%s_filters' % category, []) self.__init_filters(category, user_filters, filters, validate=validate) else: if kwds.get("trackster", False): diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py index c3adcc95b26..60b92ea40b5 100644 --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -708,11 +708,22 @@ class UserAPIController(BaseAPIController, UsesTagsMixin, CreatesUsersMixin, Cre function = factory.build_filter_function(filter_name) if function is None: errors['%s|%s' % (filter_type, filter_name)] = 'Filter function not found.' + + short_description, description = None, None + doc_string = docstring_trim( function.__doc__ ) + split = doc_string.split('\n\n') + if split: + short_description = split[0] + if len(split) > 1: + description = split[1] + else: + log.warning( 'No description specified in the __doc__ string for %s.' % filter_name ) + filter_inputs.append({ 'type': 'boolean', 'name': filter_name, - 'label': filter_name, - 'help': docstring_trim(function.__doc__) or 'No description available.', + 'label': short_description or filter_name, + 'help': description or 'No description available.', 'value': 'true' if filter_name in filter_values else 'false' }) if filter_inputs: From d5687bc418664bd05e4034a1beea603890128f5e Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 14 Feb 2018 08:27:55 -0500 Subject: [PATCH 2/3] PEP8 fixes. --- lib/galaxy/webapps/galaxy/api/users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py index 60b92ea40b5..6f8d125610e 100644 --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -710,14 +710,14 @@ class UserAPIController(BaseAPIController, UsesTagsMixin, CreatesUsersMixin, Cre errors['%s|%s' % (filter_type, filter_name)] = 'Filter function not found.' short_description, description = None, None - doc_string = docstring_trim( function.__doc__ ) + doc_string = docstring_trim(function.__doc__) split = doc_string.split('\n\n') if split: short_description = split[0] if len(split) > 1: description = split[1] else: - log.warning( 'No description specified in the __doc__ string for %s.' % filter_name ) + log.warning('No description specified in the __doc__ string for %s.' % filter_name) filter_inputs.append({ 'type': 'boolean', From ea2bac8a12ad220d39f7e851f70821836da4bbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Wed, 14 Feb 2018 15:20:02 +0100 Subject: [PATCH 3/3] yes, the name is tool not tools :( --- lib/galaxy/tools/toolbox/filters/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/toolbox/filters/__init__.py b/lib/galaxy/tools/toolbox/filters/__init__.py index 59ec37d67ee..8e9a1677f11 100644 --- a/lib/galaxy/tools/toolbox/filters/__init__.py +++ b/lib/galaxy/tools/toolbox/filters/__init__.py @@ -44,7 +44,7 @@ class FilterFactory(object): elif name == 'toolbox_label_filters': category = "label" if category: - validate = getattr(trans.app.config, 'user_tools_%s_filters' % category, []) + validate = getattr(trans.app.config, 'user_tool_%s_filters' % category, []) self.__init_filters(category, user_filters, filters, validate=validate) else: if kwds.get("trackster", False):