Skip to content

Commit e152d8f

Browse files
committed
Remove flags from custom widgets constructor, support QJazz
1 parent 97a7422 commit e152d8f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

lizmap/server_lwc.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -682,14 +682,16 @@ def request_finished(self, row: int):
682682
# plugins = {'atlasprint': {'version': '3.2.2'}}
683683
# Temporary, add plugins as markdown in the data
684684
markdown += f'* QGIS Server : {qgis_server_version}\n'
685-
py_qgis = qgis_server_info.get('py_qgis_server')
686-
if py_qgis:
687-
py_qgis_version = py_qgis.get('version', 'Not used')
685+
server_wrapper = qgis_server_info.get('py_qgis_server')
686+
if server_wrapper:
687+
wrapper_version = server_wrapper.get('version', 'Not used')
688+
wrapper_name = server_wrapper.get('name', 'Py-QGIS-Server or QJazz')
688689
else:
689690
# Legacy, old server running
690-
py_qgis_version = qgis_metadata.get('py_qgis_server_version', 'Not used')
691+
wrapper_version = qgis_metadata.get('py_qgis_server_version', 'Not used')
692+
wrapper_name = 'Py-QGIS-Server'
691693

692-
markdown += f'* Py-QGIS-Server : {py_qgis_version}\n'
694+
markdown += f'* {wrapper_name} : {wrapper_version}\n'
693695
for plugin, info in plugins.items():
694696
plugin_version = info['version']
695697
if plugin_version.lower().startswith("not"):

lizmap/widgets/warning_widget.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class WarningWidget(QWidget):
1010

1111
""" Widget to show a warning sign with a text. """
1212

13-
def __init__(self, flags, *args, **kwargs):
13+
def __init__(self, *args, **kwargs):
1414
""" Constructor. """
15-
super().__init__(flags, *args, **kwargs)
15+
super().__init__(*args, **kwargs)
1616

1717
layout = QHBoxLayout(self)
1818
image_widget = QLabel()

0 commit comments

Comments
 (0)