try to remove spaces and quotes to get a fieldname from an expression

qgis · May 26, 2014 · 2fc65a9 · 2fc65a9
1 parent dcbf893
commit 2fc65a9
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -124,8 +124,19 @@ void QgsFieldExpressionWidget::setField( const QString &fieldName )
   QModelIndex idx = mFieldProxyModel->sourceFieldModel()->indexFromName( fieldName );
   if ( !idx.isValid() )
   {
-    // new expression
-    idx = mFieldProxyModel->sourceFieldModel()->setExpression( fieldName );
+    // try to remove quotes and white spaces
+    QString simpleFieldName = fieldName.trimmed();
+    if ( simpleFieldName.startsWith( '"' ) && simpleFieldName.endsWith( '"' ) )
+    {
+      simpleFieldName.remove( 0, 1 ).chop( 1 );
+      idx = mFieldProxyModel->sourceFieldModel()->indexFromName( simpleFieldName );
+    }
+
+    if ( !idx.isValid() )
+    {
+      // new expression
+      idx = mFieldProxyModel->sourceFieldModel()->setExpression( fieldName );
+    }
   }
   QModelIndex proxyIndex = mFieldProxyModel->mapFromSource( idx );
   mCombo->setCurrentIndex( proxyIndex.row() );