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

nyalldawson · nyalldawson · commit 805739c970e3 · 2016-04-04T14:32:08.000+10:00
(cherry-picked from a4ed8e0)
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -343,13 +343,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
`@@ -343,13 +343,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()`
`343`	`343`	`{`
`344`	`344`	`bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;`
`345`	`345`	`QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();`
`346`		`- runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );`
	`346`	`+ runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`void QgsAttributeTableDialog::updateFieldFromExpressionSelected()`
`350`	`350`	`{`
`351`	`351`	`QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds();`
`352`		`- runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );`
	`352`	`+ runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, const QString& fieldName, const QString& expression, const QgsFeatureIds& filteredIds )`