Fix sorting of expressions in relation reference widget

m-kuhn · m-kuhn · commit 9ad4d39cf1ee · 2016-09-20T12:17:49.000+02:00
Fix #15451
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -537,12 +537,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
`@@ -537,12 +537,7 @@ void QgsRelationReferenceWidget::init()`
`537`	`537`	`mFeatureListModel->setInjectNull( mAllowNull );`
`538`	`538`	`if ( mOrderByValue )`
`539`	`539`	`{`
`540`		`- const QStringList referencedColumns = QgsExpression( mReferencedLayer->displayExpression() ).referencedColumns();`
`541`		`- if ( !referencedColumns.isEmpty() )`
`542`		`- {`
`543`		`- int sortIdx = mReferencedLayer->fieldNameIndex( referencedColumns.first() );`
`544`		`- mFilterModel->sort( sortIdx );`
`545`		`- }`
	`540`	`+ mFilterModel->sort( mReferencedLayer->displayExpression() );`
`546`	`541`	`}`
`547`	`542`
`548`	`543`	`mComboBox->setModel( mFeatureListModel );`