[attrtable] Order by the correct column when header is clicked

m-kuhn · m-kuhn · commit 744c61cb19d2 · 2016-06-03T15:54:24.000+02:00
The column index was messed up when columns have been reordered
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -63,8 +63,9 @@ bool QgsAttributeTableFilterModel::lessThan( const QModelIndex &left, const QMod
 
 void QgsAttributeTableFilterModel::sort( int column, Qt::SortOrder order )
 {
-  masterModel()->prefetchColumnData( column );
-  QSortFilterProxyModel::sort( column, order );
+  int myColumn = mColumnMapping.at( column );
+  masterModel()->prefetchColumnData( myColumn );
+  QSortFilterProxyModel::sort( myColumn, order );
 }
 
 QVariant QgsAttributeTableFilterModel::data( const QModelIndex& index, int role ) const

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,9 @@ bool QgsAttributeTableFilterModel::lessThan( const QModelIndex &left, const QMod`
`63`	`63`
`64`	`64`	`void QgsAttributeTableFilterModel::sort( int column, Qt::SortOrder order )`
`65`	`65`	`{`
`66`		`- masterModel()->prefetchColumnData( column );`
`67`		`- QSortFilterProxyModel::sort( column, order );`
	`66`	`+ int myColumn = mColumnMapping.at( column );`
	`67`	`+ masterModel()->prefetchColumnData( myColumn );`
	`68`	`+ QSortFilterProxyModel::sort( myColumn, order );`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`QVariant QgsAttributeTableFilterModel::data( const QModelIndex& index, int role ) const`