Fixed disappearing item issue when subform editing

elpaso · elpaso · commit 93bd825e1e29 · 2015-11-04T10:37:43.000+01:00
see #11266
diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp
@@ -187,18 +187,19 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes&
   {
     int referencedIdx = referencedLayer()->fields().indexFromName( fieldPair.referencedField() );
     int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );
+    Q_UNUSED(referencingIdx);
 
     QgsField referencedField = referencedLayer()->fields().at( referencedIdx );
 
     if ( referencedField.type() == QVariant::String )
     {
       // Use quotes
-      conditions << QString( "\"%1\" = '%2'" ).arg( fieldPair.referencedField(), attributes.at( referencingIdx ).toString() );
+      conditions << QString( "\"%1\" = '%2'" ).arg( fieldPair.referencedField(), attributes.at( referencedIdx ).toString() );
     }
     else
     {
       // No quotes
-      conditions << QString( "\"%1\" = %2" ).arg( fieldPair.referencedField(), attributes.at( referencingIdx ).toString() );
+      conditions << QString( "\"%1\" = %2" ).arg( fieldPair.referencedField(), attributes.at( referencedIdx ).toString() );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -187,18 +187,19 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes&`
`187`	`187`	`{`
`188`	`188`	`int referencedIdx = referencedLayer()->fields().indexFromName( fieldPair.referencedField() );`
`189`	`189`	`int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );`
	`190`	`+ Q_UNUSED(referencingIdx);`
`190`	`191`
`191`	`192`	`QgsField referencedField = referencedLayer()->fields().at( referencedIdx );`
`192`	`193`
`193`	`194`	`if ( referencedField.type() == QVariant::String )`
`194`	`195`	`{`
`195`	`196`	`// Use quotes`
`196`		`- conditions << QString( "\"%1\" = '%2'" ).arg( fieldPair.referencedField(), attributes.at( referencingIdx ).toString() );`
	`197`	`+ conditions << QString( "\"%1\" = '%2'" ).arg( fieldPair.referencedField(), attributes.at( referencedIdx ).toString() );`
`197`	`198`	`}`
`198`	`199`	`else`
`199`	`200`	`{`
`200`	`201`	`// No quotes`
`201`		`- conditions << QString( "\"%1\" = %2" ).arg( fieldPair.referencedField(), attributes.at( referencingIdx ).toString() );`
	`202`	`+ conditions << QString( "\"%1\" = %2" ).arg( fieldPair.referencedField(), attributes.at( referencedIdx ).toString() );`
`202`	`203`	`}`
`203`	`204`	`}`
`204`	`205`