FIX #35196, layer was not set on QgsFieldExpressionWidget

qgis · Jun 2, 2020 · 834c5ba · 834c5ba
1 parent c6b7aed
commit 834c5ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/gui/attributeformconfig/qgsattributeformcontaineredit.cpp b/src/gui/attributeformconfig/qgsattributeformcontaineredit.cpp
@@ -18,7 +18,7 @@
 #include "qgsattributesformproperties.h"
 
 
-QgsAttributeFormContainerEdit::QgsAttributeFormContainerEdit( QTreeWidgetItem *item, QWidget *parent )
+QgsAttributeFormContainerEdit::QgsAttributeFormContainerEdit( QTreeWidgetItem *item, QgsVectorLayer *layer, QWidget *parent )
   : QWidget( parent )
   , mTreeItem( item )
 {
@@ -40,6 +40,7 @@ QgsAttributeFormContainerEdit::QgsAttributeFormContainerEdit( QTreeWidgetItem *i
   mShowAsGroupBoxCheckBox->setChecked( itemData.showAsGroupBox() );
 
   mControlVisibilityGroupBox->setChecked( itemData.visibilityExpression().enabled() );
+  mVisibilityExpressionWidget->setLayer( layer );
   mVisibilityExpressionWidget->setExpression( itemData.visibilityExpression()->expression() );
   mColumnCountSpinBox->setValue( itemData.columnCount() );
   mBackgroundColorButton->setColor( itemData.backgroundColor() );

diff --git a/src/gui/attributeformconfig/qgsattributeformcontaineredit.h b/src/gui/attributeformconfig/qgsattributeformcontaineredit.h
@@ -36,7 +36,7 @@ class GUI_EXPORT QgsAttributeFormContainerEdit: public QWidget, private Ui_QgsAt
     Q_OBJECT
 
   public:
-    explicit QgsAttributeFormContainerEdit( QTreeWidgetItem *item, QWidget *parent = nullptr );
+    explicit QgsAttributeFormContainerEdit( QTreeWidgetItem *item, QgsVectorLayer *layer, QWidget *parent = nullptr );
 
     /**
      * Register an expression context generator class that will be used to retrieve

diff --git a/src/gui/vector/qgsattributesformproperties.cpp b/src/gui/vector/qgsattributesformproperties.cpp
@@ -438,7 +438,7 @@ void QgsAttributesFormProperties::loadAttributeContainerEdit()
     return;
 
   QTreeWidgetItem *currentItem = mFormLayoutTree->selectedItems().at( 0 );
-  mAttributeContainerEdit = new QgsAttributeFormContainerEdit( currentItem, this );
+  mAttributeContainerEdit = new QgsAttributeFormContainerEdit( currentItem, mLayer, this );
   mAttributeContainerEdit->registerExpressionContextGenerator( this );
   mAttributeContainerEdit->layout()->setContentsMargins( 0, 0, 0, 0 );
   mAttributeTypeFrame->layout()->setContentsMargins( 0, 0, 0, 0 );