Fix sorting in attribute table

rouault · rouault · commit 671850f66a58 · 2016-06-13T16:40:37.000+02:00
Regression introduced with 3ec3dae (2.14.3) where QgsAttributeTableModel::data(index, SortRole) returned an empty variant. Fixes #14927
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -593,6 +593,11 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     val = mFeat.attribute( fieldId );
   }
 
+  if ( role == SortRole )
+  {
+    return val;
+  }
+
   switch ( role )
   {
     case Qt::DisplayRole:

Original file line number	Diff line number	Diff line change
`@@ -593,6 +593,11 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons`
`593`	`593`	`val = mFeat.attribute( fieldId );`
`594`	`594`	`}`
`595`	`595`
	`596`	`+ if ( role == SortRole )`
	`597`	`+ {`
	`598`	`+ return val;`
	`599`	`+ }`
	`600`	`+`
`596`	`601`	`switch ( role )`
`597`	`602`	`{`
`598`	`603`	`case Qt::DisplayRole:`