Changeset 34989

Timestamp:

04/07/06 18:21:17 (4 years ago)

Author:

gracinet

Message:

#1542: no <table> elt in profile just keeps the existing table

Files:

• CPSSchemas/trunk/CHANGES (modified) (1 diff)
• CPSSchemas/trunk/exportimport/layout.py (modified) (1 diff)
• CPSSchemas/trunk/tests/test_exportimport.py (modified) (2 diffs)

CPSSchemas/trunk/CHANGES

@@ -7 +7 @@
-Bug fixes:
-~~~~~~~~~~
-
+
+
-New internal features:
-~~~~~~~~~~~~~~~~~~~~~~

CPSSchemas/trunk/exportimport/layout.py

@@ -267 +267 @@
-                rows.append(row)
-            break
-hence no purge=False on it (compat with 3.4.0)
-ows = []
+do nothing
+eturn
-        self.context.setLayoutDefinition({'rows': rows})
-

CPSSchemas/trunk/tests/test_exportimport.py

@@ -195 +195 @@
-        self.assertEquals(cell, {'widget_id': 'NewCell', 'ncols': 2})
-
-
-
-
+
-        self.setPurge(False)
-        self.object.setLayoutDefinition({
@@ -207 +205 @@
-        self.importString('<?xml version="1.0"?>'
-                          ' <object name="the_layout">'
+                          ' </object>')
+        rows = self.object.getLayoutDefinition()['rows']
+        self.assertEquals(len(rows), 2)
+        row = rows[1]
+        self.assertEquals(len(row), 1)
+        cell = row[0]
+        self.assertEquals(cell, {'widget_id': 'Description', 'ncols': 2})
+
+    def test_initTable_purge_by_default(self):
+        # check that the purge=False implementation dosen't change anything
+        # if not present
+        self.setPurge(False)
+        self.object.setLayoutDefinition({
+            'style_prefix': 'layout_metadata_',
+            'ncols': 2,
+            'rows': [
+            [{'ncols': 2, 'widget_id': 'Title'},],
+            [{'ncols': 2, 'widget_id': 'Description'},],]})
+        self.importString('<?xml version="1.0"?>'
+                          ' <object name="the_layout">'
-                          '  <table>'
-                          '   <row><cell name="NewCell"/></row>'