From ba176542dc1995fe09e297ff92c602a8152846b8 Mon Sep 17 00:00:00 2001 From: pycook Date: Sat, 23 Nov 2019 17:42:33 +0800 Subject: [PATCH 1/2] fix acl resource --- api/lib/perm/acl/resource.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/lib/perm/acl/resource.py b/api/lib/perm/acl/resource.py index 40b1a6c..90a722e 100644 --- a/api/lib/perm/acl/resource.py +++ b/api/lib/perm/acl/resource.py @@ -106,7 +106,7 @@ class ResourceGroupCRUD(object): @staticmethod def add(name, type_id, app_id): - ResourceGroup.get(name=name, resource_type_id=type_id, app_id=app_id) and abort( + ResourceGroup.get_by(name=name, resource_type_id=type_id, app_id=app_id) and abort( 400, "ResourceGroup <{0}> is already existed".format(name)) return ResourceGroup.create(name=name, resource_type_id=type_id, app_id=app_id) @@ -150,7 +150,7 @@ class ResourceCRUD(object): @staticmethod def add(name, type_id, app_id): - Resource.get(name=name, resource_type_id=type_id, app_id=app_id) and abort( + Resource.get_by(name=name, resource_type_id=type_id, app_id=app_id) and abort( 400, "Resource <{0}> is already existed".format(name)) return Resource.create(name=name, resource_type_id=type_id, app_id=app_id) From b6be430aa362aeb55e29707dc8422d42b54072d0 Mon Sep 17 00:00:00 2001 From: pycook Date: Sat, 23 Nov 2019 21:50:45 +0800 Subject: [PATCH 2/2] fix --- api/lib/perm/acl/permission.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/lib/perm/acl/permission.py b/api/lib/perm/acl/permission.py index c06a09a..57abae3 100644 --- a/api/lib/perm/acl/permission.py +++ b/api/lib/perm/acl/permission.py @@ -16,8 +16,9 @@ class PermissionCRUD(object): perms = RolePermission.get_by(group_id=group_id, to_dict=False) for perm in perms: - result.setdefault((perm.rid, RoleCache.get(perm.rid).name), []).append( - PermissionCache.get(perm.perm_id).to_dict()) + perm_dict = PermissionCache.get(perm.perm_id).to_dict() + perm_dict.update(dict(rid=perm.rid)) + result.setdefault(RoleCache.get(perm.rid).name, []).append(perm_dict) return result