From 5fcd83b587cd020346c830bbc5146b6f02062050 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Thu, 2 Feb 2023 14:37:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=20s?=
 =?UTF-8?q?wagger=20api=20=E6=97=B6=EF=BC=8CAssetSerializer=20category,=20?=
 =?UTF-8?q?type=20=E5=AD=97=E6=AE=B5=E6=89=8B=E5=8A=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=20=5Fchoices=20=E5=B1=9E=E6=80=A7=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/acls/serializers/login_acl.py        | 4 ++--
 apps/assets/serializers/asset/common.py   | 4 ++--
 apps/perms/serializers/permission.py      | 4 +---
 apps/tickets/serializers/ticket/ticket.py | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

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):