Do not always check SSL, add missing features from 4.0.0

3liz · Nov 27, 2023 · 10b1b82 · 10b1b82
1 parent 2ead67f
commit 10b1b82
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/lizmap/dialogs/main.py b/lizmap/dialogs/main.py
@@ -109,17 +109,6 @@ def __init__(self, parent=None, is_dev_version=True):
         # Filtering features
         self.tab_filtering.setCurrentIndex(0)
 
-        # Temporary for the next release
-        if not self.is_dev_version:
-            self.tab_filtering.removeTab(2)
-            # Temporary fixer buttons
-            self.button_use_estimated_md.setVisible(False)
-            self.label_66.setVisible(False)
-            self.button_trust_project.setVisible(False)
-            self.label_79.setVisible(False)
-            self.button_simplify_geom.setVisible(False)
-            self.label_82.setVisible(False)
-
         self.helper_list_group.setReadOnly(True)
         self.button_helper_group.setToolTip(tr('Select features having at least one group not matching on the server'))
         self.button_helper_group.clicked.connect(self.select_unknown_features_group)

diff --git a/lizmap/plugin.py b/lizmap/plugin.py
@@ -3009,16 +3009,17 @@ def project_config_file(
 
         if check_server:
 
-            error, message = check_project_ssl_postgis(self.project)
-            for layer in error:
-                self.dlg.check_results.add_error(
-                    Error(
-                        layer.layer_name,
-                        Checks.SSLConnection,
-                        source_type=SourceLayer(layer.layer_name, layer.layer_id),
+            if is_lizmap_cloud(server_metadata):
+                error, message = check_project_ssl_postgis(self.project)
+                for layer in error:
+                    self.dlg.check_results.add_error(
+                        Error(
+                            layer.layer_name,
+                            Checks.SSLConnection,
+                            source_type=SourceLayer(layer.layer_name, layer.layer_id),
+                        )
                     )
-                )
-                self.dlg.enabled_ssl_button(True)
+                    self.dlg.enabled_ssl_button(True)
 
             autogenerated_keys, int8 = project_invalid_pk(self.project)
             for layer in autogenerated_keys:

diff --git a/lizmap/widgets/check_project.py b/lizmap/widgets/check_project.py
@@ -388,7 +388,7 @@ class Checks(Check, Enum):
                     'In the project properties → Data sources → at the bottom, there is a checkbox to trust the '
                     'project when the layer has no metadata.'
                 ),
-                auto_fix=qgis_32200,
+                auto_fix=tr('With QGIS ≥ 3.22, you can use the auto-fix button in the "Settings" panel of the plugin'),
             )
         ),
         Levels.Project,