From cd2b7360b5530af9e2c4619ba5937e456318bb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 7 Nov 2015 14:05:02 +0100 Subject: [PATCH] misc: create a property to get formdef keywords as a list (#8905) --- wcs/api.py | 7 +------ wcs/formdef.py | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/wcs/api.py b/wcs/api.py index 30a2b0e..9b8ca2a 100644 --- a/wcs/api.py +++ b/wcs/api.py @@ -297,16 +297,11 @@ class ApiFormdefsDirectory(Directory): continue authentication_required = True - if formdef.keywords: - keywords = [x.strip() for x in formdef.keywords.split(',')] - else: - keywords = [] - formdict = {'title': unicode(formdef.name, charset), 'slug': formdef.url_name, 'url': formdef.get_url(), 'description': formdef.description or '', - 'keywords': keywords, + 'keywords': formdef.keywords_list, 'authentication_required': authentication_required} formdict['redirection'] = bool(formdef.is_disabled() and diff --git a/wcs/formdef.py b/wcs/formdef.py index bd8eb57..dd8e82a 100644 --- a/wcs/formdef.py +++ b/wcs/formdef.py @@ -327,6 +327,12 @@ class FormDef(StorableObject): self.workflow_id = None workflow = property(get_workflow, set_workflow) + @property + def keywords_list(self): + if not self.keywords: + return [] + return [x.strip() for x in self.keywords.split(',')] + def get_variable_options(self): variables = {} if not self.workflow.variables_formdef: -- 2.6.2