Merge remote-tracking branch 'origin/v3.5'

This commit is contained in:
Adolfo Gómez García 2022-01-29 21:45:46 +01:00
commit 2a7b112437

View File

@ -266,7 +266,7 @@ def getServicesData(
# If no usable pools, this is not visible
if metaTransports:
group = (
group: typing.MutableMapping[str, typing.Any] = (
meta.servicesPoolGroup.as_dict
if meta.servicesPoolGroup
else ServicePoolGroup.default().as_dict
@ -275,6 +275,7 @@ def getServicesData(
services.append(
{
'id': 'M' + meta.uuid,
'is_meta': True,
'name': meta.name,
'visual_name': meta.visual_name,
'description': meta.comments,
@ -378,6 +379,7 @@ def getServicesData(
services.append(
{
'id': 'F' + sPool.uuid,
'is_meta': False,
'name': datator(sPool.name),
'visual_name': datator(
sPool.visual_name.replace('{use}', use_percent).replace(