From 38606a92b0d172b71e62db76f4b235eb27af65bf Mon Sep 17 00:00:00 2001 From: Zoran Sinnema Date: Wed, 18 Dec 2019 11:51:18 +0100 Subject: [PATCH 1/2] fix: return class_name + ( import_path ) as class_name --- scidash/sciunittests/serializers.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scidash/sciunittests/serializers.py b/scidash/sciunittests/serializers.py index b5471bbb..ded04cab 100644 --- a/scidash/sciunittests/serializers.py +++ b/scidash/sciunittests/serializers.py @@ -17,7 +17,6 @@ class TestSuiteSerializer(GetOrCreateMixin, WritableNestedModelSerializer): - owner = ScidashUserSerializer( default=serializers.CurrentUserDefault(), read_only=True ) @@ -30,9 +29,17 @@ class Meta: class TestClassSerializer( GetByKeyOrCreateMixin, WritableNestedModelSerializer ): + class_name = serializers.SerializerMethodField() units_name = serializers.CharField(required=False) key = 'import_path' + def get_class_name(self, obj): + # return class_name + ( first part of import_path ) + return obj.class_name + \ + (' (' + \ + '.'.join(obj.import_path.split('.')[0:-1]) + + ')').replace(' ()', '') + class Meta: model = TestClass fields = '__all__' @@ -132,7 +139,6 @@ class Meta: class ScoreClassSerializer( GetByKeyOrCreateMixin, WritableNestedModelSerializer ): - key = 'class_name' class Meta: From 15037775d10077e2230b28afa0ee0b9dbae5a242 Mon Sep 17 00:00:00 2001 From: Zoran Sinnema Date: Thu, 19 Dec 2019 12:10:57 +0100 Subject: [PATCH 2/2] fix: code cleanup --- scidash/sciunittests/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scidash/sciunittests/serializers.py b/scidash/sciunittests/serializers.py index ded04cab..97f369dc 100644 --- a/scidash/sciunittests/serializers.py +++ b/scidash/sciunittests/serializers.py @@ -36,7 +36,7 @@ class TestClassSerializer( def get_class_name(self, obj): # return class_name + ( first part of import_path ) return obj.class_name + \ - (' (' + \ + (' (' + '.'.join(obj.import_path.split('.')[0:-1]) + ')').replace(' ()', '')