feat: user fields CURD #1205

TencentBlueKing · Oct 7, 2023 · 3924ffe · 3924ffe
1 parent 5631058
commit 3924ffe
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 115 deletions.
diff --git a/src/bk-user/bkuser/apis/web/tenant_setting/serializers.py b/src/bk-user/bkuser/apis/web/tenant_setting/serializers.py
@@ -16,8 +16,8 @@
 from rest_framework import serializers
 
 from bkuser.apps.tenant.models import TenantUserCustomField
-from bkuser.apps.tenant_setting.constants import UserFieldDataType
-from bkuser.apps.tenant_setting.models import TenantUserCustomFieldOptions
+from bkuser.apps.tenant.constants import UserFieldDataType
+from bkuser.apps.tenant.data_models import TenantUserCustomFieldOptions
 
 logger = logging.getLogger(__name__)
 

diff --git a/src/bk-user/bkuser/apis/web/tenant_setting/views.py b/src/bk-user/bkuser/apis/web/tenant_setting/views.py
@@ -38,7 +38,7 @@ def get(self, request, *args, **kwargs):
         slz = TenantUserFieldOutputSLZ(
             instance={
                 "builtin_fields": UserBuiltinField.objects.all(),
-                "custom_fields": TenantUserCustomField.objects.filter(tenant_id=tenant_id).all(),
+                "custom_fields": TenantUserCustomField.objects.filter(tenant_id=tenant_id),
             }
         )
         return Response(slz.data)
@@ -94,7 +94,7 @@ def put(self, request, *args, **kwargs):
         custom_field.options = data["options"]
         custom_field.save()
 
-        return Response()
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
     @swagger_auto_schema(
         tags=["tenant-setting"],

diff --git a/...user/bkuser/apps/tenant_setting/models.py → ...bk-user/bkuser/apps/tenant/data_models.py b/...user/bkuser/apps/tenant_setting/models.py → ...bk-user/bkuser/apps/tenant/data_models.py
diff --git a/src/bk-user/bkuser/apps/tenant_setting/__init__.py b/src/bk-user/bkuser/apps/tenant_setting/__init__.py
diff --git a/src/bk-user/bkuser/apps/tenant_setting/apps.py b/src/bk-user/bkuser/apps/tenant_setting/apps.py
diff --git a/src/bk-user/bkuser/apps/tenant_setting/constants.py b/src/bk-user/bkuser/apps/tenant_setting/constants.py
diff --git a/src/bk-user/bkuser/apps/tenant_setting/migrations/0001_initial.py b/src/bk-user/bkuser/apps/tenant_setting/migrations/0001_initial.py
diff --git a/src/bk-user/bkuser/apps/tenant_setting/migrations/__init__.py b/src/bk-user/bkuser/apps/tenant_setting/migrations/__init__.py
diff --git a/src/bk-user/bkuser/settings.py b/src/bk-user/bkuser/settings.py
@@ -54,7 +54,6 @@
     "bkuser.apps.sync",
     "bkuser.apps.idp",
     "bkuser.apps.natural_user",
-    "bkuser.apps.tenant_setting",
 ]
 
 MIDDLEWARE = [