CFG - Remove some unused keys about serverFrame and popupFrame

3liz · Jun 23, 2023 · 4ed7a6a · 4ed7a6a
1 parent d30bf72
commit 4ed7a6a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lizmap/lizmap_api/config.py b/lizmap/lizmap_api/config.py
@@ -274,6 +274,9 @@ def __init__(self, project, fix_json=False):
                 'wType': 'checkbox', 'type': 'boolean', 'default': False, 'children': 'popupFrame'
             },
             'popupFrame': {
+                'comment': (
+                    'This is not included in the CFG, I think it is used only because of parent/children, todo clean'
+                ),
                 'wType': 'frame', 'type': None, 'default': None, 'parent': 'popup'
             },
             'popupSource': {
@@ -410,6 +413,9 @@ def __init__(self, project, fix_json=False):
                 'wType': 'checkbox', 'type': 'boolean', 'default': False, 'children': 'serverFrame', 'parent': 'singleTile'
             },
             'serverFrame': {
+                'comment': (
+                    'This is not included in the CFG, I think it is used only because of parent/children, todo clean'
+                ),
                 'wType': 'frame', 'type': None, 'default': None, 'parent': 'cached'
             },
             'cacheExpiration': {

diff --git a/lizmap/plugin.py b/lizmap/plugin.py
@@ -2848,6 +2848,12 @@ def project_config_file(self, lwc_version: LwcVersions, with_gui: bool = True, c
                 else:
                     layer_options['externalWmsToggle'] = str(False)
 
+            if 'serverFrame' in layer_options.keys():
+                del layer_options['serverFrame']
+
+            if 'popupFrame' in layer_options.keys():
+                del layer_options['popupFrame']
+
             # Add layer options to the json object
             liz2json["layers"][v['name']] = layer_options