Minor code cleanups for composer attribute table widget

nyalldawson · nyalldawson · commit 0c4e8e6436ee · 2014-10-19T16:03:34.000+11:00
diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -565,14 +565,17 @@ void QgsComposerAttributeTableWidget::updateRelationsCombo()
   QgsVectorLayer* atlasLayer = atlasCoverageLayer();
   if ( atlasLayer )
   {
-    QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( mComposerTable->composition()->atlasComposition().coverageLayer() );
+    QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( atlasLayer );
     Q_FOREACH ( const QgsRelation& relation, relations )
     {
       mRelationsComboBox->addItem( relation.name(), relation.id() );
     }
+    if ( mComposerTable )
+    {
+      mRelationsComboBox->setCurrentIndex( mRelationsComboBox->findData( mComposerTable->relationId() ) );
+    }
   }
 
-  mRelationsComboBox->setCurrentIndex( mRelationsComboBox->findData( mComposerTable->relationId() ) );
   mRelationsComboBox->blockSignals( false );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -565,14 +565,17 @@ void QgsComposerAttributeTableWidget::updateRelationsCombo()`
`565`	`565`	`QgsVectorLayer* atlasLayer = atlasCoverageLayer();`
`566`	`566`	`if ( atlasLayer )`
`567`	`567`	`{`
`568`		`- QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( mComposerTable->composition()->atlasComposition().coverageLayer() );`
	`568`	`+ QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( atlasLayer );`
`569`	`569`	`Q_FOREACH ( const QgsRelation& relation, relations )`
`570`	`570`	`{`
`571`	`571`	`mRelationsComboBox->addItem( relation.name(), relation.id() );`
`572`	`572`	`}`
	`573`	`+ if ( mComposerTable )`
	`574`	`+ {`
	`575`	`+ mRelationsComboBox->setCurrentIndex( mRelationsComboBox->findData( mComposerTable->relationId() ) );`
	`576`	`+ }`
`573`	`577`	`}`
`574`	`578`
`575`		`- mRelationsComboBox->setCurrentIndex( mRelationsComboBox->findData( mComposerTable->relationId() ) );`
`576`	`579`	`mRelationsComboBox->blockSignals( false );`
`577`	`580`	`}`
`578`	`581`