Infra
/
risotto
9
0
Fork 1
Code Issues 1 Releases Wiki Activity

Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

This commit is contained in:
Emmanuel Garette 2021-05-18 18:55:46 +02:00
parent 617ef55dd3 94b6563d8f
commit fc5a13152b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/risotto/controller.py
View File

@ -309,6 +309,7 @@ except:
await config_std.property.read_only() await config_std.property.read_only()
# copy informations from 'to deploy' configuration to configuration # copy informations from 'to deploy' configuration to configuration
await config.information.importation(await config_std.information.exportation())
await config.value.importation(await config_std.value.exportation()) await config.value.importation(await config_std.value.exportation())
await config.permissive.importation(await config_std.permissive.exportation()) await config.permissive.importation(await config_std.permissive.exportation())
await config.property.importation(await config_std.property.exportation()) await config.property.importation(await config_std.property.exportation())

2
src/risotto/utils.py
View File

@ -23,5 +23,5 @@ def tiramisu_display_name(kls,
if suffix: if suffix:
doc += suffix doc += suffix
if name != doc: if name != doc:
name += f' ({doc})' name += f'" "{doc}'
return name return name