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

fix(ci_type_group_manager): fix resources issues

This commit is contained in:
songbing01249 2023-07-19 14:42:27 +08:00 committed by pycook
parent b9d83f7539
commit 49d612d8db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmdb-api/api/lib/cmdb/ci_type.py
View File

@ -235,7 +235,7 @@ class CITypeGroupManager(object):
for t in sorted(CITypeGroupItem.get_by(group_id=group['id']), key=lambda x: x['order'] or 0):
ci_type = CITypeCache.get(t['type_id']).to_dict()
if resources is None or (ci_type and ci_type['name'] in resources):
ci_type['permissions'] = resources[ci_type['name']]
ci_type['permissions'] = resources[ci_type['name']] if resources is not None else None
group.setdefault("ci_types", []).append(ci_type)
group_types.add(t["type_id"])
@ -244,7 +244,7 @@ class CITypeGroupManager(object):
other_types = dict(ci_types=[])
for ci_type in ci_types:
if ci_type["id"] not in group_types and (resources is None or ci_type['name'] in resources):
ci_type['permissions'] = resources.get(ci_type['name'])
ci_type['permissions'] = resources.get(ci_type['name']) if resources is not None else None
other_types['ci_types'].append(ci_type)
groups.append(other_types)