Fix attr table model field order when changed in the provider

Fixes the GUI part of #45139
qgis · Sep 21, 2021 · 0c4d0ea · 0c4d0ea
1 parent 46c7c12
commit 0c4d0ea
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in b/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in
@@ -203,11 +203,13 @@ Returns -1 if none is defined.
     virtual int columnCount( const QModelIndex &parent ) const;
 
 
-    void setAttributeTableConfig( const QgsAttributeTableConfig &config );
+    void setAttributeTableConfig( const QgsAttributeTableConfig &config);
 %Docstring
 Set the attribute table configuration to control which fields are shown,
 in which order they are shown as well as if and where an action column
 is shown.
+
+:param config: attribute table config
 %End
 
     void setFilterExpression( const QgsExpression &expression, const QgsExpressionContext &context );

diff --git a/src/core/qgsattributetableconfig.cpp b/src/core/qgsattributetableconfig.cpp
@@ -86,8 +86,14 @@ void QgsAttributeTableConfig::update( const QgsFields &fields )
       newColumn.hidden = false;
       newColumn.type = Field;
       newColumn.name = field.name();
-
-      mColumns.append( newColumn );
+      if ( containsActionColumn )
+      {
+        mColumns.insert( mColumns.size() - 1, newColumn );
+      }
+      else
+      {
+        mColumns.append( newColumn );
+      }
     }
   }
 

diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -143,13 +143,13 @@ int QgsAttributeTableFilterModel::columnCount( const QModelIndex &parent ) const
   return mColumnMapping.count();
 }
 
-void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTableConfig &config )
+void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTableConfig &config, bool force )
 {
   const QgsAttributeTableConfig oldConfig = mConfig;
   mConfig = config;
   mConfig.update( layer()->fields() );
 
-  if ( mConfig.hasSameColumns( oldConfig ) )
+  if ( !force && mConfig.hasSameColumns( oldConfig ) )
   {
     return;
   }

diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h
@@ -238,8 +238,10 @@ class GUI_EXPORT QgsAttributeTableFilterModel: public QSortFilterProxyModel, pub
      * Set the attribute table configuration to control which fields are shown,
      * in which order they are shown as well as if and where an action column
      * is shown.
+     * \param config attribute table config
+     * \param force default FALSE, if TRUE the attribute table configuration will be reset even if it is not changed.
      */
-    void setAttributeTableConfig( const QgsAttributeTableConfig &config );
+    void setAttributeTableConfig( const QgsAttributeTableConfig &config, bool force SIP_PYARGREMOVE = false );
 
     /**
      * Set the \a expression and the \a context to be stored in case of the features

diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -128,6 +128,13 @@ void QgsDualView::init( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas, const Qg
   mAttributeForm = nullptr;
 
   mLayer = layer;
+
+  // Keep fields order in sync: force config reset
+  connect( mLayer, &QgsVectorLayer::updatedFields, this, [ = ]
+  {
+    mFilterModel->setAttributeTableConfig( attributeTableConfig(), /* force */ true );
+  } );
+
   mEditorContext = context;
 
   // create an empty form to find out if it needs geometry or not