From 881b551f477b475fc76c01d3f1d701e8d1d49a84 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sat, 21 Dec 2019 13:28:18 +0100
Subject: [PATCH] description in group

---
 data/creole.dtd                               |  1 +
 src/rougail/annotator.py                      |  4 +++
 src/rougail/objspace.py                       |  2 --
 .../00-base.xml                               | 27 +++++++++++++++
 .../makedict/base.json                        |  1 +
 .../result/00-base.xml                        | 34 +++++++++++++++++++
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 tests/flattener_dicos/10load_masterslaves_description/00-base.xml
 create mode 100644 tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
 create mode 100644 tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml

diff --git a/data/creole.dtd b/data/creole.dtd
index 8ca948f0..f3b06fca 100644
--- a/data/creole.dtd
+++ b/data/creole.dtd
@@ -215,6 +215,7 @@
 
 <!ELEMENT group (slave+)>
 <!ATTLIST group master CDATA #REQUIRED>
+<!ATTLIST group description CDATA #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param type (string|eole|number|container|context|python) "string">
diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index 6980364a..ad5619e4 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -566,6 +566,10 @@ class SpaceAnnotator(object):
                                 leader_space.variable = []
                                 leader_space.name = leader_name
                                 leader_space.hidden = variable.hidden
+                                if hasattr(group, 'description'):
+                                    leader_space.doc = group.description
+                                else:
+                                    leader_space.doc = variable.description
                                 variable.hidden = None
                                 self.paths.append('family', leader_path + '.' + leader_name, namespace, creoleobj=leader_space)
                                 # manage leader's variable
diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index ae39d8de..5969ac99 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -513,8 +513,6 @@ class CreoleObjSpace(object):
             for subspace in space:
                 if isinstance(subspace, self.Leadership):
                     _name = 'leader'
-                    subspace.doc = subspace.variable[0].description
-                    #subspace.doc = 'Leadership {}'.format(subspace.name)
                 else:
                     _name = name
                 if name in ['containers', 'variables', 'actions']:
diff --git a/tests/flattener_dicos/10load_masterslaves_description/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
new file mode 100644
index 00000000..d9d7866b
--- /dev/null
+++ b/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<creole>
+    <variables>
+        <family name='general'>
+            <variable name='mode_conteneur_actif' type='oui/non' description="No change">
+                <value>non</value>
+            </variable>
+        </family>
+        <family name='general1'>
+            <variable name='master' type='string' description="master" multi="True"/>
+            <variable name='slave1' type='string' description="slave1" multi="True"/>
+            <variable name='slave2' type='string' description="slave2" multi="True"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name='calc_val' target='slave1'>
+            <param name='valeur'>valfill</param>
+        </fill>
+        <fill name='calc_val' target='slave2'>
+            <param type='eole'>slave1</param>
+        </fill>
+        <group master='master' description="other description">
+            <slave>slave1</slave>
+            <slave>slave2</slave>
+        </group>
+    </constraints>
+</creole>
diff --git a/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
new file mode 100644
index 00000000..7c3624f5
--- /dev/null
+++ b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
@@ -0,0 +1 @@
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
\ No newline at end of file
diff --git a/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
new file mode 100644
index 00000000..2197054a
--- /dev/null
+++ b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<creole>
+  <family doc="" name="creole">
+    <family doc="general" name="general">
+      <property>normal</property>
+      <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
+        <choice type="string">oui</choice>
+        <choice type="string">non</choice>
+        <property>mandatory</property>
+        <property>normal</property>
+        <value type="string">non</value>
+      </variable>
+    </family>
+    <family doc="general1" name="general1">
+      <property>normal</property>
+      <leader doc="other description" name="master">
+        <property>normal</property>
+        <variable doc="master" multi="True" name="master" type="string"/>
+        <variable doc="slave1" multi="True" name="slave1" type="string">
+          <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param name="valeur" transitive="False" type="string">valfill</param>
+          </value>
+        </variable>
+        <variable doc="slave2" multi="True" name="slave2" type="string">
+          <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param transitive="False" type="eole">creole.general1.master.slave1</param>
+          </value>
+        </variable>
+      </leader>
+    </family>
+  </family>
+</creole>