mirror of https://github.com/veops/cmdb.git
Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
|
5e2bedfb37 | |
|
fb19353c70 |
|
@ -64,9 +64,13 @@ class CITypeView(APIView):
|
||||||
ci_type['unique_name'] = ci_type['unique_id'] and AttributeCache.get(ci_type['unique_id']).name
|
ci_type['unique_name'] = ci_type['unique_id'] and AttributeCache.get(ci_type['unique_id']).name
|
||||||
ci_types.append(ci_type)
|
ci_types.append(ci_type)
|
||||||
elif type_name is not None:
|
elif type_name is not None:
|
||||||
ci_type = CITypeCache.get(type_name).to_dict()
|
ci_type = CITypeCache.get(type_name)
|
||||||
ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(ci_type['id'])
|
if ci_type is not None:
|
||||||
ci_types = [ci_type]
|
ci_type = ci_type.to_dict()
|
||||||
|
ci_type['parent_ids'] = CITypeInheritanceManager.get_parents(ci_type['id'])
|
||||||
|
ci_types = [ci_type]
|
||||||
|
else:
|
||||||
|
ci_types = []
|
||||||
else:
|
else:
|
||||||
ci_types = CITypeManager().get_ci_types(q)
|
ci_types = CITypeManager().get_ci_types(q)
|
||||||
count = len(ci_types)
|
count = len(ci_types)
|
||||||
|
|
|
@ -41,7 +41,7 @@ services:
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
cmdb-api:
|
cmdb-api:
|
||||||
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.17
|
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.5.1
|
||||||
container_name: cmdb-api
|
container_name: cmdb-api
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
@ -84,7 +84,7 @@ services:
|
||||||
test: "ps aux|grep -v grep|grep -v '1 root'|grep gunicorn || exit 1"
|
test: "ps aux|grep -v grep|grep -v '1 root'|grep gunicorn || exit 1"
|
||||||
|
|
||||||
cmdb-ui:
|
cmdb-ui:
|
||||||
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.17
|
image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.5.1
|
||||||
container_name: cmdb-ui
|
container_name: cmdb-ui
|
||||||
depends_on:
|
depends_on:
|
||||||
cmdb-api:
|
cmdb-api:
|
||||||
|
|
Loading…
Reference in New Issue