Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V2.5 dev #1109

Merged
merged 4 commits into from
Aug 1, 2022
Merged

V2.5 dev #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4043384
feat: 🎸 更改重名的schema
jinji-hanbin Aug 1, 2022
5fd97d7
Merge pull request #1108 from longguikeji/feature-402
hanbinloop Aug 1, 2022
7b86180
fix: 🐛 tenant slug 可以为空
welylongguikeji Aug 1, 2022
acb775d
Merge branch 'v2.5-dev' of https://github.com/longguikeji/arkid into …
welylongguikeji Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v1/schema/permission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion api/v1/schema/tenant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class TenantConfigItemOut(Schema):
title=_("租户名称"),
)

slug: str = Field(
slug: Optional[str] = Field(
title=_("slug")
)

Expand Down
6 changes: 3 additions & 3 deletions api/v1/views/permission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand Down