diff --git a/apps/acls/serializers/login_acl.py b/apps/acls/serializers/login_acl.py index 99b1f1077..59b9cf0ad 100644 --- a/apps/acls/serializers/login_acl.py +++ b/apps/acls/serializers/login_acl.py @@ -52,10 +52,10 @@ class LoginACLSerializer(BulkModelSerializer): action = self.fields.get("action") if not action: return - choices = action._choices + choices = action.choices if not has_valid_xpack_license(): choices.pop(LoginACL.ActionChoices.review, None) - action._choices = choices + action.choices = choices def get_rules_serializer(self): return RuleSerializer() diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py index 82a163d84..e51c4558f 100644 --- a/apps/assets/serializers/asset/common.py +++ b/apps/assets/serializers/asset/common.py @@ -139,9 +139,9 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali return category = request.path.strip('/').split('/')[-1].rstrip('s') field_category = self.fields.get('category') - field_category._choices = Category.filter_choices(category) + field_category.choices = Category.filter_choices(category) field_type = self.fields.get('type') - field_type._choices = AllTypes.filter_choices(category) + field_type.choices = AllTypes.filter_choices(category) @classmethod def setup_eager_loading(cls, queryset): diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index 63ba3a765..fef9929b8 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -70,9 +70,7 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): actions = self.fields.get("actions") if not actions: return - choices = actions._choices - actions._choices = choices - actions.default = list(choices.keys()) + actions.default = list(actions.choices.keys()) @classmethod def setup_eager_loading(cls, queryset): diff --git a/apps/tickets/serializers/ticket/ticket.py b/apps/tickets/serializers/ticket/ticket.py index 334031e5e..4a36ccf4f 100644 --- a/apps/tickets/serializers/ticket/ticket.py +++ b/apps/tickets/serializers/ticket/ticket.py @@ -39,9 +39,9 @@ class TicketSerializer(OrgResourceModelSerializerMixin): tp = self.fields.get('type') if not tp: return - choices = tp._choices + choices = tp.choices choices.pop(TicketType.general, None) - tp._choices = choices + tp.choices = choices @classmethod def setup_eager_loading(cls, queryset):