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

chore: release v2.4.3

This commit is contained in:
pycook 2024-04-17 19:35:35 +08:00
parent 0966d104a7
commit 7d1a05e487
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1233,7 +1233,10 @@ class CITypeTemplateManager(object):
def _import_ci_types(self, ci_types, attr_id_map): def _import_ci_types(self, ci_types, attr_id_map):
for i in ci_types: for i in ci_types:
i.pop("unique_key", None) i.pop("unique_key", None)
i.pop("show_name", None)
i['unique_id'] = attr_id_map.get(i['unique_id'], i['unique_id']) i['unique_id'] = attr_id_map.get(i['unique_id'], i['unique_id'])
if i.get('show_id'):
i['show_id'] = attr_id_map.get(i['show_id'], i['show_id'])
i['uid'] = current_user.uid i['uid'] = current_user.uid
return self.__import(CIType, ci_types) return self.__import(CIType, ci_types)

5
cmdb-api/api/lib/cmdb/preference.py
View File

@ -298,8 +298,9 @@ class PreferenceManager(object):
for type_id in id2type: for type_id in id2type:
id2type[type_id] = CITypeCache.get(type_id).to_dict() id2type[type_id] = CITypeCache.get(type_id).to_dict()
id2type[type_id]['unique_name'] = AttributeCache.get(id2type[type_id]['unique_id']).name id2type[type_id]['unique_name'] = AttributeCache.get(id2type[type_id]['unique_id']).name
id2type[type_id]['show_name'] = AttributeCache.get( if id2type[type_id]['show_id']:
id2type[type_id]['show_id']).name if id2type[type_id]['show_id'] else None show_attr = AttributeCache.get(id2type[type_id]['show_id'])
id2type[type_id]['show_name'] = show_attr and show_attr.name
return result, id2type, sorted(name2id, key=lambda x: x[1]) return result, id2type, sorted(name2id, key=lambda x: x[1])

4
docker-compose.yml
View File

@ -43,7 +43,7 @@ services:
- redis - redis
cmdb-api: cmdb-api:
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.2 image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.3
# build: # build:
# context: . # context: .
# target: cmdb-api # target: cmdb-api
@ -85,7 +85,7 @@ services:
- cmdb-api - cmdb-api
cmdb-ui: cmdb-ui:
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.2 image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.3
# build: # build:
# context: . # context: .
# target: cmdb-ui # target: cmdb-ui