leadership in dynamic family + path of leadership in extra

This commit is contained in:
2021-04-16 09:19:58 +02:00
parent e354352dc8
commit 12111397e6
47 changed files with 329 additions and 2 deletions

View File

@ -275,7 +275,7 @@ class Annotator(Walk):
f'to multi variable')
raise DictConsistencyError(msg, 16, family.xmlfiles)
for variable in family.variable.values():
if isinstance(variable, self.objectspace.family):
if isinstance(variable, self.objectspace.family) and not variable.leadership:
msg = _(f'dynamic family "{family.name}" cannot contains another family')
raise DictConsistencyError(msg, 22, family.xmlfiles)

View File

@ -488,7 +488,7 @@ class RougailObjSpace:
elif isinstance(variableobj, self.family): # pylint: disable=E1101
family_name = variableobj.name
if namespace != self.rougailconfig['variable_namespace']:
family_name = namespace + '.' + family_name
family_name = space.path + '.' + family_name
self.paths.add_family(namespace,
family_name,
variableobj,