[layouts] Avoid resetting column selection when restoring project

with an atttribute table set to the "atlas feature" source Fixes #20538
qgis · May 22, 2019 · 810b522 · 810b522
1 parent fbd3289
commit 810b522
Show file tree

Hide file tree

Showing 3 changed files with 567 additions and 2 deletions.
diff --git a/src/core/layout/qgslayoutitemattributetable.cpp b/src/core/layout/qgslayoutitemattributetable.cpp
@@ -183,10 +183,15 @@ void QgsLayoutItemAttributeTable::atlasLayerChanged( QgsVectorLayer *layer )
     disconnect( mCurrentAtlasLayer, &QgsVectorLayer::layerModified, this, &QgsLayoutTable::refreshAttributes );
   }
 
+  const bool mustRebuildColumns = static_cast< bool >( mCurrentAtlasLayer ) || mColumns.empty();
   mCurrentAtlasLayer = layer;
 
-  //rebuild column list to match all columns from layer
-  resetColumns();
+  if ( mustRebuildColumns )
+  {
+    //rebuild column list to match all columns from layer
+    resetColumns();
+  }
+
   refreshAttributes();
 
   //listen for modifications to layer and refresh table when they occur

diff --git a/tests/src/core/testqgslayouttable.cpp b/tests/src/core/testqgslayouttable.cpp
@@ -31,6 +31,9 @@
 #include "qgsrelationmanager.h"
 #include "qgsreadwritecontext.h"
 #include "qgsexpressioncontextutils.h"
+#include "qgslayoutmanager.h"
+#include "qgsprintlayout.h"
+#include "qgslayoutatlas.h"
 
 #include <QObject>
 #include "qgstest.h"
@@ -60,6 +63,7 @@ class TestQgsLayoutTable : public QObject
     void attributeTableExtend();
     void attributeTableRepeat();
     void attributeTableAtlasSource(); //test attribute table in atlas feature mode
+    void attributeTableRestoreAtlasSource();
     void attributeTableRelationSource(); //test attribute table in relation mode
     void contentsContainsRow(); //test the contentsContainsRow function
     void removeDuplicates(); //test removing duplicate rows
@@ -610,6 +614,23 @@ void TestQgsLayoutTable::attributeTableAtlasSource()
 
 }
 
+void TestQgsLayoutTable::attributeTableRestoreAtlasSource()
+{
+  const QString projectPath = QStringLiteral( TEST_DATA_DIR ) + "/layout_atlas_table.qgs";
+  QgsProject p;
+  p.read( projectPath );
+
+  QgsPrintLayout *l = dynamic_cast< QgsPrintLayout *>( p.layoutManager()->layouts().at( 0 ) );
+  QgsLayoutItemAttributeTable *table = qobject_cast< QgsLayoutItemAttributeTable * >( l->multiFrames().at( 0 ) );
+  QCOMPARE( table->source(), QgsLayoutItemAttributeTable::AtlasFeature );
+  QVERIFY( l->atlas()->coverageLayer() );
+  QVERIFY( l->atlas()->coverageLayer()->isValid() );
+  QCOMPARE( table->sourceLayer(), l->atlas()->coverageLayer() );
+  QCOMPARE( table->columns().count(), 2 );
+  QCOMPARE( table->columns().at( 0 )->attribute(), QStringLiteral( "Heading" ) );
+  QCOMPARE( table->columns().at( 1 )->attribute(), QStringLiteral( "Staff" ) );
+}
+
 
 void TestQgsLayoutTable::attributeTableRelationSource()
 {