diff --git a/apps/acls/serializers/base.py b/apps/acls/serializers/base.py index 5b3e8d173..3654784ee 100644 --- a/apps/acls/serializers/base.py +++ b/apps/acls/serializers/base.py @@ -90,7 +90,7 @@ class BaseACLSerializer(ActionAclSerializer, serializers.Serializer): fields_small = fields_mini + [ "is_active", "priority", "action", "date_created", "date_updated", - "comment", "created_by", "org_id", + "comment", "created_by" ] fields_m2m = ["reviewers", ] fields = fields_small + fields_m2m @@ -100,6 +100,20 @@ class BaseACLSerializer(ActionAclSerializer, serializers.Serializer): 'reviewers': {'label': _('Recipients')}, } +class BaseUserACLSerializer(BaseACLSerializer): + users = JSONManyToManyField(label=_('User')) + + class Meta(BaseACLSerializer.Meta): + fields = BaseACLSerializer.Meta.fields + ['users'] + + +class BaseUserAssetAccountACLSerializer(BaseUserACLSerializer): + assets = JSONManyToManyField(label=_('Asset')) + accounts = serializers.ListField(label=_('Account')) + + class Meta(BaseUserACLSerializer.Meta): + fields = BaseUserACLSerializer.Meta.fields + ['assets', 'accounts', 'org_id'] + def validate_reviewers(self, reviewers): action = self.initial_data.get('action') if not action and self.instance: @@ -118,19 +132,4 @@ class BaseACLSerializer(ActionAclSerializer, serializers.Serializer): "None of the reviewers belong to Organization `{}`".format(org.name) ) raise serializers.ValidationError(error) - return valid_reviewers - - -class BaseUserACLSerializer(BaseACLSerializer): - users = JSONManyToManyField(label=_('User')) - - class Meta(BaseACLSerializer.Meta): - fields = BaseACLSerializer.Meta.fields + ['users'] - - -class BaseUserAssetAccountACLSerializer(BaseUserACLSerializer): - assets = JSONManyToManyField(label=_('Asset')) - accounts = serializers.ListField(label=_('Account')) - - class Meta(BaseUserACLSerializer.Meta): - fields = BaseUserACLSerializer.Meta.fields + ['assets', 'accounts'] + return valid_reviewers \ No newline at end of file