Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix field name loading following activity on master
  • Loading branch information
nyalldawson committed Apr 3, 2020
1 parent 966045f commit fa0a6c3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
Expand Up @@ -88,7 +88,7 @@ Returns the current layer or a None.
%Docstring

.. deprecated:: QGIS 3.14
use epxressionTree()->loadFieldNames() instead
use expressionTree()->loadFieldNames() instead
%End

void loadFieldsAndValues( const QMap<QString, QStringList> &fieldValues ) /Deprecated/;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsexpressionbuilderwidget.h
Expand Up @@ -98,7 +98,7 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
//! \deprecated since QGIS 3.14 this is now done automatically
Q_DECL_DEPRECATED void loadFieldNames() {} SIP_DEPRECATED

//! \deprecated since QGIS 3.14 use epxressionTree()->loadFieldNames() instead
//! \deprecated since QGIS 3.14 use expressionTree()->loadFieldNames() instead
Q_DECL_DEPRECATED void loadFieldNames( const QgsFields &fields ) {mExpressionTreeView->loadFieldNames( fields );} SIP_DEPRECATED

/**
Expand Down
3 changes: 3 additions & 0 deletions src/gui/qgsfieldexpressionwidget.cpp
Expand Up @@ -243,6 +243,9 @@ void QgsFieldExpressionWidget::editExpression()
dlg.setWindowTitle( mExpressionDialogTitle );
dlg.setAllowEvalErrors( mAllowEvalErrors );

if ( !vl )
dlg.expressionBuilder()->expressionTree()->loadFieldNames( mFieldProxyModel->sourceFieldModel()->fields() );

if ( dlg.exec() )
{
QString newExpression = dlg.expressionText();
Expand Down

0 comments on commit fa0a6c3

Please sign in to comment.