Autogenerated relation names in dialog instead of ids

signedav · signedav · commit a49ed0976965 · 2017-11-15T12:26:35.000+01:00
The autogenerated ids are quite long and this leads that they where very unconfortable to use in the configuration of relation reference in the attribute type widget of layer properties - attribute form. So now the names are used in the combo instead of the ids. This effects only the GUI. Fix: #17441
diff --git a/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp b/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp
@@ -36,7 +36,7 @@ QgsRelationReferenceConfigDlg::QgsRelationReferenceConfigDlg( QgsVectorLayer *vl
 
   Q_FOREACH ( const QgsRelation &relation, vl->referencingRelations( fieldIdx ) )
   {
-    mComboRelation->addItem( QStringLiteral( "%1 (%2)" ).arg( relation.id(), relation.referencedLayerId() ), relation.id() );
+    mComboRelation->addItem( QStringLiteral( "%1 (%2)" ).arg( relation.name(), relation.referencedLayerId() ), relation.id() );
     if ( relation.referencedLayer() )
     {
       mExpressionWidget->setField( relation.referencedLayer()->displayExpression() );

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ QgsRelationReferenceConfigDlg::QgsRelationReferenceConfigDlg( QgsVectorLayer *vl`
`36`	`36`
`37`	`37`	`Q_FOREACH ( const QgsRelation &relation, vl->referencingRelations( fieldIdx ) )`
`38`	`38`	`{`
`39`		`- mComboRelation->addItem( QStringLiteral( "%1 (%2)" ).arg( relation.id(), relation.referencedLayerId() ), relation.id() );`
	`39`	`+ mComboRelation->addItem( QStringLiteral( "%1 (%2)" ).arg( relation.name(), relation.referencedLayerId() ), relation.id() );`
`40`	`40`	`if ( relation.referencedLayer() )`
`41`	`41`	`{`
`42`	`42`	`mExpressionWidget->setField( relation.referencedLayer()->displayExpression() );`