Fix sorting of expressions in relation reference widget

m-kuhn · m-kuhn · commit 65e221cafe88 · 2016-09-20T12:09:39.000+02:00
Fix #15451
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -532,12 +532,7 @@ void QgsRelationReferenceWidget::init()
     mFeatureListModel->setInjectNull( mAllowNull );
     if ( mOrderByValue )
     {
-      const QStringList referencedColumns = QgsExpression( mReferencedLayer->displayExpression() ).referencedColumns();
-      if ( !referencedColumns.isEmpty() )
-      {
-        int sortIdx = mReferencedLayer->fieldNameIndex( referencedColumns.first() );
-        mFilterModel->sort( sortIdx );
-      }
+      mFilterModel->sort( mReferencedLayer->displayExpression() );
     }
 
     mComboBox->setModel( mFeatureListModel );

Original file line number	Diff line number	Diff line change
`@@ -532,12 +532,7 @@ void QgsRelationReferenceWidget::init()`
`532`	`532`	`mFeatureListModel->setInjectNull( mAllowNull );`
`533`	`533`	`if ( mOrderByValue )`
`534`	`534`	`{`
`535`		`- const QStringList referencedColumns = QgsExpression( mReferencedLayer->displayExpression() ).referencedColumns();`
`536`		`- if ( !referencedColumns.isEmpty() )`
`537`		`- {`
`538`		`- int sortIdx = mReferencedLayer->fieldNameIndex( referencedColumns.first() );`
`539`		`- mFilterModel->sort( sortIdx );`
`540`		`- }`
	`535`	`+ mFilterModel->sort( mReferencedLayer->displayExpression() );`
`541`	`536`	`}`
`542`	`537`
`543`	`538`	`mComboBox->setModel( mFeatureListModel );`