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

fix(common): fix 'ACLManager' object has no attribute 'create_app' (#217)

This commit is contained in:
Evan Sung 2023-10-20 22:38:19 -05:00 committed by GitHub
parent 2e85a9971b
commit f5607d96f3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmdb-api/api/commands/click_common_setting.py
View File

@ -216,10 +216,9 @@ class InitDepartment(object):
) )
try: try:
app = acl.validate_app() app = acl.validate_app()
if app: if not app:
return acl acl.create_app(payload)
return acl
acl.create_app(payload)
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
if '不存在' in str(e): if '不存在' in str(e):

12
cmdb-api/api/lib/common_setting/acl.py
View File

@ -1,13 +1,13 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
from flask import abort
from flask import current_app from flask import current_app
from api.lib.common_setting.resp_format import ErrFormat from api.lib.common_setting.resp_format import ErrFormat
from api.lib.perm.acl.app import AppCRUD
from api.lib.perm.acl.cache import RoleCache, AppCache from api.lib.perm.acl.cache import RoleCache, AppCache
from api.lib.perm.acl.permission import PermissionCRUD
from api.lib.perm.acl.resource import ResourceTypeCRUD, ResourceCRUD
from api.lib.perm.acl.role import RoleCRUD, RoleRelationCRUD from api.lib.perm.acl.role import RoleCRUD, RoleRelationCRUD
from api.lib.perm.acl.user import UserCRUD from api.lib.perm.acl.user import UserCRUD
from api.lib.perm.acl.resource import ResourceTypeCRUD, ResourceCRUD
from api.lib.perm.acl.permission import PermissionCRUD
class ACLManager(object): class ACLManager(object):
@ -133,3 +133,9 @@ class ACLManager(object):
def grant_resource(self, rid, resource_id, perms): def grant_resource(self, rid, resource_id, perms):
PermissionCRUD.grant(rid, perms, resource_id=resource_id, group_id=None) PermissionCRUD.grant(rid, perms, resource_id=resource_id, group_id=None)
@staticmethod
def create_app(payload):
rt = AppCRUD.add(**payload)
return rt.to_dict()