Merge pull request #1110 from longguikeji/release-2.5.1-beta

Release 2.5.1 beta
longguikeji · Aug 1, 2022 · ee8a7d9 · ee8a7d9
2 parents 3669022 + 816268d
commit ee8a7d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/api/v1/schema/permission.py b/api/v1/schema/permission.py
@@ -20,7 +20,7 @@
     )
 )
 
-class PermissionListSchemaOut(ModelSchema):
+class PermissionsListSchemaOut(ModelSchema):
 
     app_name: str = Field(default=None, alias="app.name", title=_("应用名称"))
     sort_id: int = Field(hidden=True)
@@ -29,7 +29,7 @@ class PermissionListSchemaOut(ModelSchema):
 
     class Config:
         model = Permission
-        model_fields = ['id', 'name', 'is_system', 'is_open']
+        model_fields = ['id', 'name', 'is_system']
 
 
 class PermissionSchemaOut(Schema):

diff --git a/api/v1/schema/tenant.py b/api/v1/schema/tenant.py
@@ -58,7 +58,7 @@ class TenantConfigItemOut(Schema):
         title=_("租户名称"),
     )
 
-    slug: str = Field(
+    slug: Optional[str] = Field(
         title=_("slug")
     )
 

diff --git a/api/v1/views/permission.py b/api/v1/views/permission.py
@@ -44,7 +44,7 @@ def create_permission(request, tenant_id: str, data: PermissionCreateSchemaIn):
     return ErrorDict(ErrorCode.OK)
 
 
-@api.get("/tenant/{tenant_id}/permissions", response=List[PermissionListSchemaOut], tags=['权限'])
+@api.get("/tenant/{tenant_id}/permissions", response=List[PermissionsListSchemaOut], tags=['权限'])
 @operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)
 def list_permissions(request, tenant_id: str,  app_id: str = None, select_user_id: str = None, group_id: str = None, app_name: str = None, category: str = None):
@@ -57,7 +57,7 @@ def list_permissions(request, tenant_id: str,  app_id: str = None, select_user_i
     return permissiondata.get_permissions_by_search(tenant_id, app_id, select_user_id, group_id, login_user, app_name=app_name, category=category)
 
 
-@api.get("/tenant/{tenant_id}/childmanager_permissions", response=List[PermissionListSchemaOut], tags=['权限'])
+@api.get("/tenant/{tenant_id}/childmanager_permissions", response=List[PermissionsListSchemaOut], tags=['权限'])
 @operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)
 def childmanager_permissions(request, tenant_id: str, only_show_group: int = 0):
@@ -226,7 +226,7 @@ def usergroup_remove_permission(request, tenant_id: str, select_usergroup_id: st
     return ErrorDict(ErrorCode.OK)
 
 
-@api.get("/tenant/{tenant_id}/group_permissions", response=List[PermissionListSchemaOut], tags=['权限'])
+@api.get("/tenant/{tenant_id}/group_permissions", response=List[PermissionsListSchemaOut], tags=['权限'])
 @operation(roles=[TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)
 def list_group_permissions(request, tenant_id: str, select_usergroup_id: str = None, app_name: str = None, category: str = None):