Skip to content

Commit c5f65ab

Browse files
committed
Honour visibilityExpressionEnabled when setting visibilityExpression in generated form
1 parent 063100e commit c5f65ab

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/config_generator/dnd_form_generator.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@ def __add_tablayout_fields(self, maplayer, projectname, layername, project, pare
350350

351351
widget = ElementTree.Element("widget")
352352
widget.set("class", "QWidget")
353-
self.__add_widget_property(widget, "visibilityExpression", None, None, child.get("visibilityExpression"))
353+
visibilityExpression = child.get("visibilityExpression") if child.get("visibilityExpressionEnabled", "0") == "1" else ""
354+
self.__add_widget_property(widget, "visibilityExpression", None, None, visibilityExpression)
354355
self.__add_widget_property(widget, "title", child, "name", "", "attribute")
355356
tabWidget.append(widget)
356357

@@ -371,7 +372,8 @@ def __add_tablayout_fields(self, maplayer, projectname, layername, project, pare
371372
self.__add_label_style_properties(widget, child.find("labelStyle"))
372373
else:
373374
widget.set("class", "QFrame")
374-
self.__add_widget_property(widget, "visibilityExpression", None, None, child.get("visibilityExpression"))
375+
visibilityExpression = child.get("visibilityExpression") if child.get("visibilityExpressionEnabled", "0") == "1" else ""
376+
self.__add_widget_property(widget, "visibilityExpression", None, None, visibilityExpression)
375377
item.append(widget)
376378

377379
self.__add_tablayout_fields(maplayer, projectname, layername, project, widget, child, aliases)

0 commit comments

Comments
 (0)