[expression builder] clear fields values when changing field (#8703)

qgis · Dec 19, 2018 · a753f8b · a753f8b
1 parent 0f037da
commit a753f8b
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -235,13 +235,19 @@ void QgsExpressionBuilderWidget::currentChanged( const QModelIndex &index, const
   if ( !item )
     return;
 
-  if ( item->getItemType() == QgsExpressionItem::Field && mFieldValues.contains( item->text() ) )
+  bool isField = mLayer && item->getItemType() == QgsExpressionItem::Field;
+  if ( isField )
   {
-    const QStringList &values = mFieldValues[item->text()];
-    mValuesModel->setStringList( values );
+    if ( mFieldValues.contains( item->text() ) )
+    {
+      const QStringList &values = mFieldValues[item->text()];
+      mValuesModel->setStringList( values );
+    }
+    else
+    {
+      mValuesModel->setStringList( QStringList() );
+    }
   }
-
-  bool isField = mLayer && item->getItemType() == QgsExpressionItem::Field;
   mValueGroupBox->setVisible( isField );
   mShowHelpButton->setText( isField ? tr( "Show Values" ) : tr( "Show Help" ) );