refactor
This commit is contained in:
@ -59,3 +59,7 @@ def cdrom_minormajor(*args, **kwargs):
|
||||
|
||||
def device_type(*args, **kwargs):
|
||||
pass
|
||||
|
||||
|
||||
def calc_list(*args, **kwargs):
|
||||
return []
|
||||
|
@ -1,8 +1,6 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family name="services">
|
||||
<family name="service0" doc="tata">
|
||||
<property>basic</property>
|
||||
</family>
|
||||
<family name="service0" doc="tata"/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>basic</property>
|
||||
@ -23,4 +23,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>normal</property>
|
||||
@ -23,4 +23,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>basic</property>
|
||||
@ -14,4 +14,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>expert</property>
|
||||
@ -14,4 +14,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
1
tests/flattener_dicos/00load_comment/makedict/base.json
Normal file
1
tests/flattener_dicos/00load_comment/makedict/base.json
Normal file
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non"}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>normal</property>
|
||||
@ -16,4 +16,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.without_type": "non"}
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.without_type": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>normal</property>
|
||||
@ -21,4 +21,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
1
tests/flattener_dicos/00load_save/makedict/base.json
Normal file
1
tests/flattener_dicos/00load_save/makedict/base.json
Normal file
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non"}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>normal</property>
|
||||
@ -16,4 +16,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif1": "non"}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>normal</property>
|
||||
@ -26,4 +26,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -16,9 +16,9 @@
|
||||
</variables>
|
||||
|
||||
<constraints>
|
||||
<auto name="calc_val" target="mode_conteneur_actif">
|
||||
<fill name="calc_val" target="mode_conteneur_actif">
|
||||
<param type="variable">mode_conteneur_actif1</param>
|
||||
</auto>
|
||||
</fill>
|
||||
</constraints>
|
||||
|
||||
<help/>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif1": "non"}
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -16,8 +16,8 @@
|
||||
</variables>
|
||||
|
||||
<constraints>
|
||||
<auto name="calc_val" target="mode_conteneur_actif">
|
||||
</auto>
|
||||
<fill name="calc_val" target="mode_conteneur_actif">
|
||||
</fill>
|
||||
</constraints>
|
||||
|
||||
<help/>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif1": "non"}
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -23,4 +23,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
1
tests/flattener_dicos/01base_multi/makedict/base.json
Normal file
1
tests/flattener_dicos/01base_multi/makedict/base.json
Normal file
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": ["non"]}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -16,4 +16,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
1
tests/flattener_dicos/01base_submulti/makedict/base.json
Normal file
1
tests/flattener_dicos/01base_submulti/makedict/base.json
Normal file
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": [["non"]]}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -16,4 +16,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>basic</property>
|
||||
@ -32,4 +32,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>basic</property>
|
||||
@ -23,4 +23,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif1": "non"}
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif1": "non"}
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="Général" name="general">
|
||||
<property>normal</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -20,4 +20,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif1": "non"}
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -22,4 +22,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif1": "non"}
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non"}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -18,4 +18,4 @@
|
||||
<separator name="creole.general.mode_conteneur_actif">Établissement</separator>
|
||||
</separators>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non"}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -18,4 +18,4 @@
|
||||
<separator name="creole.general.mode_conteneur_actif" never_hidden="True">Établissement</separator>
|
||||
</separators>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.autosavevar": null}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>basic</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.autosavevar": null}
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.autosavevar": null}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>basic</property>
|
||||
@ -26,4 +26,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -18,4 +18,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -23,4 +23,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -21,4 +21,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -23,4 +23,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -44,4 +44,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -38,4 +38,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>basic</property>
|
||||
@ -24,4 +24,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -34,4 +34,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -9,22 +9,22 @@
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="leader" type="string" description="leader" multi="True"/>
|
||||
<variable name="follower1" type="string" description="follower1" multi="True"/>
|
||||
<variable name="follower2" type="string" description="follower2" multi="True"/>
|
||||
<variable name="follower3" type="string" description="follower3" multi="True"/>
|
||||
<variable name="follower1" type="string" description="follower1" multi="True" hidden="True"/>
|
||||
<variable name="follower2" type="string" description="follower2" multi="True" hidden="True"/>
|
||||
<variable name="follower3" type="string" description="follower3" multi="True" hidden="True"/>
|
||||
</family>
|
||||
</variables>
|
||||
|
||||
<constraints>
|
||||
<auto name="calc_val" target="follower1">
|
||||
<fill name="calc_val" target="follower1">
|
||||
<param name="valeur">valfill</param>
|
||||
</auto>
|
||||
<auto name="calc_val" target="follower2">
|
||||
</fill>
|
||||
<fill name="calc_val" target="follower2">
|
||||
<param type="variable">follower1</param>
|
||||
</auto>
|
||||
<auto name="calc_val" target="follower3">
|
||||
</fill>
|
||||
<fill name="calc_val" target="follower3">
|
||||
<param type="variable">leader</param>
|
||||
</auto>
|
||||
</fill>
|
||||
<group leader="leader">
|
||||
<follower>follower1</follower>
|
||||
<follower>follower2</follower>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": []}
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": [], "creole.general.leader.follower3": []}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -43,4 +43,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -9,18 +9,18 @@
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="leader" type="string" description="leader" multi="True"/>
|
||||
<variable name="follower1" type="string" description="follower1" multi="True"/>
|
||||
<variable name="follower2" type="string" description="follower2" multi="True"/>
|
||||
<variable name="follower1" type="string" description="follower1" multi="True" hidden="True"/>
|
||||
<variable name="follower2" type="string" description="follower2" multi="True" hidden="True"/>
|
||||
</family>
|
||||
</variables>
|
||||
|
||||
<constraints>
|
||||
<auto name="calc_val" target="follower1">
|
||||
<fill name="calc_val" target="follower1">
|
||||
<param name="valeur">valfill</param>
|
||||
</auto>
|
||||
<auto name="calc_val" target="follower2">
|
||||
</fill>
|
||||
<fill name="calc_val" target="follower2">
|
||||
<param type="variable">leader</param>
|
||||
</auto>
|
||||
</fill>
|
||||
<group leader="leader">
|
||||
<follower>follower1</follower>
|
||||
<follower>follower2</follower>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": []}
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -34,4 +34,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -10,16 +10,16 @@
|
||||
</variable>
|
||||
</family>
|
||||
<family name="leadermode" mode="expert">
|
||||
<variable name="leader" type="string" description="leader" multi="True"/>
|
||||
<variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
|
||||
<variable name="follower1" type="string" description="follower1" multi="True"/>
|
||||
<variable name="follower2" type="string" description="follower2" multi="True"/>
|
||||
</family>
|
||||
</variables>
|
||||
|
||||
<constraints>
|
||||
<auto name="calc_val" target="leader">
|
||||
<fill name="calc_list" target="leader">
|
||||
<param name="valeur">valfill</param>
|
||||
</auto>
|
||||
</fill>
|
||||
<group leader="leader">
|
||||
<follower>follower1</follower>
|
||||
<follower>follower2</follower>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": "non"}
|
||||
{"creole.general.mode_conteneur_actif": "non", "creole.leadermode.leader.leader": [], "creole.leadermode.leader.follower1": [], "creole.leadermode.leader.follower2": []}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>expert</property>
|
||||
@ -19,17 +19,21 @@
|
||||
<variable doc="leader" multi="True" name="leader" type="string">
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<value name="calc_val" type="calculation">
|
||||
<value name="calc_list" type="calculation">
|
||||
<param name="valeur" transitive="False" type="string">valfill</param>
|
||||
</value>
|
||||
</variable>
|
||||
<variable doc="follower1" multi="True" name="follower1" type="string">
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<property>expert</property>
|
||||
</variable>
|
||||
<variable doc="follower2" multi="True" name="follower2" type="string">
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<property>expert</property>
|
||||
</variable>
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -28,4 +28,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="Général" name="general">
|
||||
<property>normal</property>
|
||||
@ -28,4 +28,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>basic</property>
|
||||
@ -30,4 +30,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -29,4 +29,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": []}
|
||||
{"creole.general.mode_conteneur_actif": "oui", "creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": []}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="général" name="general">
|
||||
<property>normal</property>
|
||||
@ -24,4 +24,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -41,4 +41,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -13,6 +13,9 @@
|
||||
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
|
||||
<choice type="string">oui</choice>
|
||||
<choice type="string">non</choice>
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<property>hidden</property>
|
||||
<property>mandatory</property>
|
||||
<property>normal</property>
|
||||
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property>
|
||||
@ -21,6 +24,9 @@
|
||||
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
|
||||
<choice type="string">oui</choice>
|
||||
<choice type="string">non</choice>
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<property>hidden</property>
|
||||
<property>mandatory</property>
|
||||
<property>normal</property>
|
||||
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property>
|
||||
@ -29,4 +35,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -11,6 +11,9 @@
|
||||
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
|
||||
<choice type="string">oui</choice>
|
||||
<choice type="string">non</choice>
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<property>hidden</property>
|
||||
<property>mandatory</property>
|
||||
<property>normal</property>
|
||||
<property inverse="False" source="creole.general.condition" type="calculation">disabled</property>
|
||||
@ -19,6 +22,9 @@
|
||||
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
|
||||
<choice type="string">oui</choice>
|
||||
<choice type="string">non</choice>
|
||||
<property>force_default_on_freeze</property>
|
||||
<property>frozen</property>
|
||||
<property>hidden</property>
|
||||
<property>mandatory</property>
|
||||
<property>normal</property>
|
||||
<property inverse="False" source="creole.general.condition" type="calculation">disabled</property>
|
||||
@ -27,4 +33,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -8,10 +8,10 @@
|
||||
<variable name="condition" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
|
||||
<variable name="mode_conteneur_actif" type="oui/non" description="No change" >
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif2" type="oui/non" description="No change" hidden="True">
|
||||
<variable name="mode_conteneur_actif2" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
</family>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
|
||||
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general2.mode_conteneur_actif3": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="Général" name="general">
|
||||
<property>normal</property>
|
||||
@ -43,4 +43,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -8,10 +8,10 @@
|
||||
<variable name="condition" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
|
||||
<variable name="mode_conteneur_actif" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif2" type="oui/non" description="No change" hidden="True">
|
||||
<variable name="mode_conteneur_actif2" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
</family>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -29,4 +29,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -8,10 +8,10 @@
|
||||
<variable name="condition" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
|
||||
<variable name="mode_conteneur_actif" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif2" type="oui/non" description="No change" hidden="True">
|
||||
<variable name="mode_conteneur_actif2" type="oui/non" description="No change">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
</family>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -29,4 +29,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
25
tests/flattener_dicos/10load_emptyvalue/00-base.xml
Normal file
25
tests/flattener_dicos/10load_emptyvalue/00-base.xml
Normal file
@ -0,0 +1,25 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<rougail>
|
||||
|
||||
<services/>
|
||||
|
||||
<variables>
|
||||
<family name="general">
|
||||
<variable name="mode_conteneur_actif" type="string" description="No change">
|
||||
<value></value>
|
||||
</variable>
|
||||
<variable name="mode_conteneur_actif2" type="string" description="No change">
|
||||
<value/>
|
||||
</variable>
|
||||
</family>
|
||||
<separators/>
|
||||
</variables>
|
||||
|
||||
<constraints>
|
||||
</constraints>
|
||||
|
||||
<help/>
|
||||
|
||||
</rougail>
|
||||
<!-- vim: ts=4 sw=4 expandtab
|
||||
-->
|
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif2": null}
|
15
tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
Normal file
15
tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
Normal file
@ -0,0 +1,15 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">
|
||||
<property>normal</property>
|
||||
</variable>
|
||||
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="string">
|
||||
<property>normal</property>
|
||||
</variable>
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</rougail>
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -33,4 +33,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -24,9 +24,9 @@
|
||||
<target type="variable">mode_conteneur_actif</target>
|
||||
<target type="variable">mode_conteneur_actif2</target>
|
||||
</condition>
|
||||
<auto name="calc_val" target="mode_conteneur_actif">
|
||||
<fill name="calc_val" target="mode_conteneur_actif">
|
||||
<param>non</param>
|
||||
</auto>
|
||||
</fill>
|
||||
</constraints>
|
||||
|
||||
<help/>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -35,4 +35,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.condition": "tous"}
|
||||
{"creole.general.condition": "tous", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -40,4 +40,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1 +1 @@
|
||||
{"creole.general.condition": "tous"}
|
||||
{"creole.general.condition": "tous", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -34,4 +34,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -31,4 +31,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -24,4 +24,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -30,4 +30,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -31,4 +31,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -27,4 +27,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -31,4 +31,4 @@
|
||||
</leader>
|
||||
</family>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -29,4 +29,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -0,0 +1 @@
|
||||
{"creole.general.mode_conteneur_actif": ["non", "oui"]}
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -17,4 +17,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>normal</property>
|
||||
@ -14,4 +14,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>expert</property>
|
||||
@ -25,4 +25,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>expert</property>
|
||||
@ -24,4 +24,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<creole>
|
||||
<rougail>
|
||||
<family doc="" name="creole">
|
||||
<family doc="general" name="general">
|
||||
<property>expert</property>
|
||||
@ -31,4 +31,4 @@
|
||||
</family>
|
||||
<separators/>
|
||||
</family>
|
||||
</creole>
|
||||
</rougail>
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user