From 6b6ea324852f905d13075390a5554602ede3baa5 Mon Sep 17 00:00:00 2001 From: mwallschlaeger Date: Fri, 6 Oct 2023 08:28:43 +0200 Subject: [PATCH] issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity --- geonode/base/api/serializers.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/geonode/base/api/serializers.py b/geonode/base/api/serializers.py index be2e7a23b86..40310a61cac 100644 --- a/geonode/base/api/serializers.py +++ b/geonode/base/api/serializers.py @@ -380,8 +380,9 @@ def to_representation(self, instance): class ContactRoleField(DynamicComputedField): default_error_messages = { - 'required': ('ContactRoleField This field is required.'), + "required": ("ContactRoleField This field is required."), } + def __init__(self, contact_type, **kwargs): self.contact_type = contact_type super().__init__(**kwargs) @@ -508,22 +509,16 @@ def __init__(self, *args, **kwargs): self.fields["resource_type"] = serializers.CharField(required=False) self.fields["polymorphic_ctype_id"] = serializers.CharField(read_only=True) self.fields["owner"] = DynamicRelationField(UserSerializer, embed=True, many=False, read_only=True) - self.fields["metadata_author"] = ContactRoleField( - Roles.METADATA_AUTHOR.name, required=False - ) + self.fields["metadata_author"] = ContactRoleField(Roles.METADATA_AUTHOR.name, required=False) self.fields["processor"] = ContactRoleField(Roles.PROCESSOR.name, required=False) self.fields["publisher"] = ContactRoleField(Roles.PUBLISHER.name, required=False) self.fields["custodian"] = ContactRoleField(Roles.CUSTODIAN.name, required=False) self.fields["poc"] = ContactRoleField(Roles.POC.name, required=False) self.fields["distributor"] = ContactRoleField(Roles.DISTRIBUTOR.name, required=False) - self.fields["resource_user"] = ContactRoleField( - Roles.RESOURCE_USER.name, required=False - ) - self.fields["resource_provider"] = ContactRoleField( - Roles.RESOURCE_PROVIDER.name, required=False) + self.fields["resource_user"] = ContactRoleField(Roles.RESOURCE_USER.name, required=False) + self.fields["resource_provider"] = ContactRoleField(Roles.RESOURCE_PROVIDER.name, required=False) self.fields["originator"] = ContactRoleField(Roles.ORIGINATOR.name, required=False) - self.fields["principal_investigator"] = ContactRoleField( - Roles.PRINCIPAL_INVESTIGATOR.name, required=False) + self.fields["principal_investigator"] = ContactRoleField(Roles.PRINCIPAL_INVESTIGATOR.name, required=False) self.fields["title"] = serializers.CharField(required=False) self.fields["abstract"] = serializers.CharField(required=False) self.fields["attribution"] = serializers.CharField(required=False)