field model: return alias as display role, but field name as edit role (

fixes #10467)
qgis · Jun 9, 2014 · 277d126 · 277d126
1 parent 45e712f
commit 277d126
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
@@ -223,6 +223,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
         QgsField field = mFields[index.internalId()];
         return ( int )field.type();
       }
+      return QVariant();
     }
 
     case Qt::DisplayRole:
@@ -232,7 +233,14 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
       {
         return mExpression[exprIdx];
       }
-      return mLayer->attributeDisplayName( index.internalId() );
+      else if ( role == Qt::EditRole )
+      {
+        return mFields[index.internalId()].name();
+      }
+      else
+      {
+        return mLayer->attributeDisplayName( index.internalId() );
+      }
     }
 
     case Qt::ForegroundRole: