skip fields which are empty in CFG file #210

3liz · Feb 7, 2020 · 24361d6 · 24361d6
1 parent b0d005f
commit 24361d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/forms/table_manager.py b/forms/table_manager.py
@@ -271,6 +271,9 @@ def to_json(self):
                 else:
                     raise Exception('InputType "{}" not implemented'.format(input_type))
 
+                if layer_data[key] == '':
+                    layer_data.pop(key)
+
             if export_legacy_single_row:
                 if self.definitions.key() == 'atlas':
                     layer_data['atlasEnabled'] = 'True'

diff --git a/test/test_table_manager.py b/test/test_table_manager.py
@@ -92,6 +92,7 @@ def test_tool_tip(self):
         table_manager.from_json(json)
         self.assertEqual(table_manager.table.rowCount(), 1)
         data = table_manager.to_json()
+        json['lines'].pop('colorGeom')
         self.assertDictEqual(data, json)
 
     def test_attribute_table(self):
@@ -152,7 +153,7 @@ def test_locate_by_layer(self):
             },
             'lines_2': {
                 'fieldName': 'name',
-                # 'filterFieldName': 'id', DISABLED on purpore. This field is not compulsory.
+                # 'filterFieldName': 'id', DISABLED on purpose. This field is not compulsory.
                 'displayGeom': 'False',
                 'minLength': 0,
                 'filterOnLocate': 'True',
@@ -195,7 +196,6 @@ def test_locate_by_layer(self):
         expected = {
             'lines_2': {
                 'fieldName': 'name',
-                'filterFieldName': '',
                 'displayGeom': 'False',
                 'minLength': 0,
                 'filterOnLocate': 'True',