Skip to content

Commit bb86f47

Browse files
committedJan 23, 2023
Fix "Alias" and "Editable" dd properties field ref
1 parent 44303cb commit bb86f47

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed
 

‎src/gui/attributeformconfig/qgsattributetypedialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx
7575
mExpressionWidget->setLayer( mLayer );
7676

7777
mEditableExpressionButton->registerExpressionContextGenerator( this );
78+
mEditableExpressionButton->init( QgsEditFormConfig::DataDefinedProperty::Editable, mDataDefinedProperties.property( QgsEditFormConfig::DataDefinedProperty::Editable ), vl->editFormConfig().propertyDefinitions(), vl );
7879
mEditableExpressionButton->registerLinkedWidget( isFieldEditableCheckBox );
7980
connect( mEditableExpressionButton, &QgsPropertyOverrideButton::changed, this, [ = ]
8081
{
8182
mDataDefinedProperties.setProperty( QgsEditFormConfig::DataDefinedProperty::Editable, mEditableExpressionButton->toProperty() );
8283
} );
8384

8485
mAliasExpressionButton->registerExpressionContextGenerator( this );
86+
mAliasExpressionButton->init( QgsEditFormConfig::DataDefinedProperty::Alias, mDataDefinedProperties.property( QgsEditFormConfig::DataDefinedProperty::Alias ), vl->editFormConfig().propertyDefinitions(), vl );
8587
connect( mAliasExpressionButton, &QgsPropertyOverrideButton::changed, this, [ = ]
8688
{
8789
mDataDefinedProperties.setProperty( QgsEditFormConfig::DataDefinedProperty::Alias, mAliasExpressionButton->toProperty() );

‎src/gui/qgsattributeform.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,15 +1809,15 @@ void QgsAttributeForm::init()
18091809
if ( mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).hasProperty( QgsEditFormConfig::DataDefinedProperty::Alias ) )
18101810
{
18111811
const QgsProperty property { mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).property( QgsEditFormConfig::DataDefinedProperty::Alias ) };
1812-
if ( property.isActive() && ! property.expressionString().isEmpty() )
1812+
if ( property.isActive() )
18131813
{
18141814
mLabelDataDefinedProperties[ label ] = property;
18151815
}
18161816
}
18171817
if ( mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).hasProperty( QgsEditFormConfig::DataDefinedProperty::Editable ) )
18181818
{
18191819
const QgsProperty property { mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).property( QgsEditFormConfig::DataDefinedProperty::Editable ) };
1820-
if ( property.isActive() && ! property.expressionString().isEmpty() )
1820+
if ( property.isActive() )
18211821
{
18221822
mEditableDataDefinedProperties[ widgetInfo.widget ] = property;
18231823
}
@@ -1900,7 +1900,7 @@ void QgsAttributeForm::init()
19001900
if ( mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).hasProperty( QgsEditFormConfig::DataDefinedProperty::Alias ) )
19011901
{
19021902
const QgsProperty property { mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).property( QgsEditFormConfig::DataDefinedProperty::Alias ) };
1903-
if ( property.isActive() && ! property.expressionString().isEmpty() )
1903+
if ( property.isActive() )
19041904
{
19051905
mLabelDataDefinedProperties[ label ] = property;
19061906
}
@@ -1922,7 +1922,7 @@ void QgsAttributeForm::init()
19221922
if ( mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).hasProperty( QgsEditFormConfig::DataDefinedProperty::Editable ) )
19231923
{
19241924
const QgsProperty property { mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).property( QgsEditFormConfig::DataDefinedProperty::Editable ) };
1925-
if ( property.isActive() && ! property.expressionString().isEmpty() )
1925+
if ( property.isActive() )
19261926
{
19271927
mEditableDataDefinedProperties[ formWidget ] = property;
19281928
}
@@ -2439,15 +2439,15 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
24392439
if ( mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).hasProperty( QgsEditFormConfig::DataDefinedProperty::Alias ) )
24402440
{
24412441
const QgsProperty property { mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).property( QgsEditFormConfig::DataDefinedProperty::Alias ) };
2442-
if ( property.isActive() && ! property.expressionString().isEmpty() )
2442+
if ( property.isActive() )
24432443
{
24442444
mLabelDataDefinedProperties[ mypLabel ] = property;
24452445
}
24462446
}
24472447
if ( mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).hasProperty( QgsEditFormConfig::DataDefinedProperty::Editable ) )
24482448
{
24492449
const QgsProperty property { mLayer->editFormConfig().dataDefinedFieldProperties( fieldName ).property( QgsEditFormConfig::DataDefinedProperty::Editable ) };
2450-
if ( property.isActive() && ! property.expressionString().isEmpty() )
2450+
if ( property.isActive() )
24512451
{
24522452
mEditableDataDefinedProperties[ widgetInfo.widget ] = property;
24532453
}

0 commit comments

Comments
 (0)
Please sign in to comment.