7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from pycook/master 

同步
This commit is contained in:
kdyq007 2019-11-23 21:53:46 +08:00 committed by GitHub
parent 63792c242f b6be430aa3
commit d19834ed5d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/lib/perm/acl/permission.py
View File

@ -16,8 +16,9 @@ class PermissionCRUD(object):
perms = RolePermission.get_by(group_id=group_id, to_dict=False) perms = RolePermission.get_by(group_id=group_id, to_dict=False)
for perm in perms: for perm in perms:
result.setdefault((perm.rid, RoleCache.get(perm.rid).name), []).append( perm_dict = PermissionCache.get(perm.perm_id).to_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 return result

4
api/lib/perm/acl/resource.py
View File

@ -106,7 +106,7 @@ class ResourceGroupCRUD(object):
@staticmethod @staticmethod
def add(name, type_id, app_id): 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)) 400, "ResourceGroup <{0}> is already existed".format(name))
return ResourceGroup.create(name=name, resource_type_id=type_id, app_id=app_id) return ResourceGroup.create(name=name, resource_type_id=type_id, app_id=app_id)
@ -150,7 +150,7 @@ class ResourceCRUD(object):
@staticmethod @staticmethod
def add(name, type_id, app_id): 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)) 400, "Resource <{0}> is already existed".format(name))
return Resource.create(name=name, resource_type_id=type_id, app_id=app_id) return Resource.create(name=name, resource_type_id=type_id, app_id=app_id)