7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-08-06 23:34:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

docker-compose is ok

Browse Source
This commit is contained in:
pycook
2023-07-11 18:12:22 +08:00
parent 109d4f1a2e
commit 6c56757a9d
11 changed files with 94 additions and 13741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-api/api/lib/cmdb/search/ci/db/search.py
View File

@@ -95,7 +95,7 @@ class Search(object):
for _v in new_v:
ci_type = CITypeCache.get(_v)
if len(new_v) == 1 and not self.sort and ci_type.default_order_attr:
if len(new_v) == 1 and not self.sort and ci_type and ci_type.default_order_attr:
self.sort = ci_type.default_order_attr
if ci_type is not None:

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

@@ -41,7 +41,7 @@ class ACLManager(object):
def get_all_roles(self):
numfound, roles = RoleCRUD.search(
None, self.app_name, 1, 999999, True, True, False)
return roles
return [i.to_dict() for i in roles]
def remove_user_from_role(self, user_rid, payload):
app_id = self.app_name