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

fix(search): correct type_id usage in CI relation filtering (#633)

This commit is contained in:
thexqn 2024-11-11 15:53:24 +08:00 committed by GitHub
parent 1138783267
commit cce88bb4b0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmdb-api/api/lib/cmdb/search/ci_relation/search.py
View File

@ -391,9 +391,10 @@ class Search(object):
id2children[str(i)] = item['children'] id2children[str(i)] = item['children']
for lv in range(1, self.level): for lv in range(1, self.level):
type_id = type_ids[lv]
if len(type_ids or []) >= lv and type2filter_perms.get(type_ids[lv]): if len(type_ids or []) >= lv and type2filter_perms.get(type_id):
id_filter_limit, _ = self._get_ci_filter(type2filter_perms[type_ids[lv]]) id_filter_limit, _ = self._get_ci_filter(type2filter_perms[type_id])
else: else:
id_filter_limit = {} id_filter_limit = {}
@ -401,12 +402,12 @@ class Search(object):
key, prefix = [i for i in level_ids], REDIS_PREFIX_CI_RELATION2 key, prefix = [i for i in level_ids], REDIS_PREFIX_CI_RELATION2
else: else:
key, prefix = [i.split(',')[-1] for i in level_ids], REDIS_PREFIX_CI_RELATION key, prefix = [i.split(',')[-1] for i in level_ids], REDIS_PREFIX_CI_RELATION
res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(key, prefix) or []]] res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(key, prefix) or []]]
res = [[i for i in x if (not id_filter_limit or (key[idx] not in id_filter_limit or res = [[i for i in x if i[1] == type_id and (not id_filter_limit or (key[idx] not in id_filter_limit or
int(i[0]) in id_filter_limit[key[idx]]) or int(i[0]) in id_filter_limit[key[idx]]) or
int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)] int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)]
_level_ids = [] _level_ids = []
type_id = type_ids[lv]
id2name = _get_id2name(type_id) id2name = _get_id2name(type_id)
for idx, node_path in enumerate(level_ids): for idx, node_path in enumerate(level_ids):
for child_id, _ in (res[idx] or []): for child_id, _ in (res[idx] or []):