field model: return alias as display role, but field name as edit role (fixes #10467)

jef-n · jef-n · commit 277d12681604 · 2014-06-09T14:50:08.000+02:00
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:

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`223`	`223`	`QgsField field = mFields[index.internalId()];`
`224`	`224`	`return ( int )field.type();`
`225`	`225`	`}`
	`226`	`+ return QVariant();`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`case Qt::DisplayRole:`
`@@ -232,7 +233,14 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`232`	`233`	`{`
`233`	`234`	`return mExpression[exprIdx];`
`234`	`235`	`}`
`235`		`- return mLayer->attributeDisplayName( index.internalId() );`
	`236`	`+ else if ( role == Qt::EditRole )`
	`237`	`+ {`
	`238`	`+ return mFields[index.internalId()].name();`
	`239`	`+ }`
	`240`	`+ else`
	`241`	`+ {`
	`242`	`+ return mLayer->attributeDisplayName( index.internalId() );`
	`243`	`+ }`
`236`	`244`	`}`
`237`	`245`
`238`	`246`	`case Qt::ForegroundRole:`