mirror of https://github.com/veops/cmdb.git
chore: release v2.4.3
This commit is contained in:
parent
dc8b1a5de2
commit
27e9919198
|
@ -1233,7 +1233,10 @@ class CITypeTemplateManager(object):
|
|||
def _import_ci_types(self, ci_types, attr_id_map):
|
||||
for i in ci_types:
|
||||
i.pop("unique_key", None)
|
||||
i.pop("show_name", None)
|
||||
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
|
||||
|
||||
return self.__import(CIType, ci_types)
|
||||
|
|
|
@ -298,8 +298,9 @@ class PreferenceManager(object):
|
|||
for type_id in id2type:
|
||||
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]['show_name'] = AttributeCache.get(
|
||||
id2type[type_id]['show_id']).name if id2type[type_id]['show_id'] else None
|
||||
if id2type[type_id]['show_id']:
|
||||
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])
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ services:
|
|||
- redis
|
||||
|
||||
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:
|
||||
# context: .
|
||||
# target: cmdb-api
|
||||
|
@ -85,7 +85,7 @@ services:
|
|||
- cmdb-api
|
||||
|
||||
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:
|
||||
# context: .
|
||||
# target: cmdb-ui
|
||||
|
|
Loading…
Reference in New Issue