Fix field calc bar error when setting to field name with spaces

nyalldawson · nyalldawson · commit a4ed8e03e649 · 2016-03-29T11:24:54.000+11:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -349,13 +349,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
 {
   bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;
   QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();
-  runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );
+  runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );
 }
 
 void QgsAttributeTableDialog::updateFieldFromExpressionSelected()
 {
   QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds();
-  runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );
+  runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );
 }
 
 void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, const QString& fieldName, const QString& expression, const QgsFeatureIds& filteredIds )

Original file line number	Diff line number	Diff line change
`@@ -349,13 +349,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()`
`349`	`349`	`{`
`350`	`350`	`bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;`
`351`	`351`	`QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();`
`352`		`- runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );`
	`352`	`+ runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`void QgsAttributeTableDialog::updateFieldFromExpressionSelected()`
`356`	`356`	`{`
`357`	`357`	`QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds();`
`358`		`- runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );`
	`358`	`+ runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, const QString& fieldName, const QString& expression, const QgsFeatureIds& filteredIds )`