From 67239b614849a8315990eed7bb9ee27b9c5a8fa2 Mon Sep 17 00:00:00 2001 From: Boris Sekachev <40690378+bsekachev@users.noreply.github.com> Date: Mon, 13 Jan 2020 16:31:38 +0300 Subject: [PATCH] Trim possible attribute values like attribute values setup by a user (#1044) --- cvat-ui/src/components/labels-editor/label-form.tsx | 2 ++ cvat/apps/engine/serializers.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cvat-ui/src/components/labels-editor/label-form.tsx b/cvat-ui/src/components/labels-editor/label-form.tsx index 6ad63efd..b23f84f6 100644 --- a/cvat-ui/src/components/labels-editor/label-form.tsx +++ b/cvat-ui/src/components/labels-editor/label-form.tsx @@ -67,6 +67,8 @@ class LabelForm extends React.PureComponent { } } + attrValues = attrValues.map((value: string) => value.trim()); + return { name: formValues.attrName[key], type: formValues.type[key], diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py index 08903d7e..285ba7f8 100644 --- a/cvat/apps/engine/serializers.py +++ b/cvat/apps/engine/serializers.py @@ -22,7 +22,7 @@ class AttributeSerializer(serializers.ModelSerializer): # pylint: disable=no-self-use def to_internal_value(self, data): attribute = data.copy() - attribute['values'] = '\n'.join(data.get('values', [])) + attribute['values'] = '\n'.join(map(lambda x: x.strip(), data.get('values', []))) return attribute def to_representation(self, instance):