burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

added number of service pools to transports list

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-09-29 13:47:12 +02:00
parent b492e7674c
commit 60b1fabcaf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/uds/REST/methods/transports.py
View File

@ -57,6 +57,7 @@ class Transports(ModelHandler):
{'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}}, {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
{'type_name': {'title': _('Type')}}, {'type_name': {'title': _('Type')}},
{'comments': {'title': _('Comments')}}, {'comments': {'title': _('Comments')}},
{'pools_count': {'title': _('Service Pools'), 'type': 'numeric', 'width': '6em'}},
{'allowed_oss': {'title': _('Devices'), 'width': '8em'}}, {'allowed_oss': {'title': _('Devices'), 'width': '8em'}},
{'tags': {'title': _('tags'), 'visible': False}}, {'tags': {'title': _('tags'), 'visible': False}},
] ]
@ -111,6 +112,7 @@ class Transports(ModelHandler):
def item_as_dict(self, item: Transport) -> typing.Dict[str, typing.Any]: def item_as_dict(self, item: Transport) -> typing.Dict[str, typing.Any]:
type_ = item.getType() type_ = item.getType()
pools = [{'id': x.uuid} for x in item.deployedServices.all()]
return { return {
'id': item.uuid, 'id': item.uuid,
'name': item.name, 'name': item.name,
@ -120,7 +122,8 @@ class Transports(ModelHandler):
'nets_positive': item.nets_positive, 'nets_positive': item.nets_positive,
'networks': [{'id': n.uuid} for n in item.networks.all()], 'networks': [{'id': n.uuid} for n in item.networks.all()],
'allowed_oss': [{'id': x} for x in item.allowed_oss.split(',')] if item.allowed_oss != '' else [], 'allowed_oss': [{'id': x} for x in item.allowed_oss.split(',')] if item.allowed_oss != '' else [],
'pools': [{'id': x.uuid} for x in item.deployedServices.all()], 'pools': pools,
'pools_count': len(pools),
'deployed_count': item.deployedServices.count(), 'deployed_count': item.deployedServices.count(),
'type': type_.type(), 'type': type_.type(),
'type_name': type_.name(), 'type_name': type_.name(),