Fixes for actions in attribute table

* Initialize datastructure in vector layer configuration dialog * Fix hidden widget if shown in last column
qgis · May 3, 2016 · 8712089 · 8712089
1 parent c1687ab
commit 8712089
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -559,6 +559,7 @@ void QgsVectorLayerProperties::apply()
     mLayer->actions()->addAction( action );
   }
   QgsAttributeTableConfig attributeTableConfig = mLayer->attributeTableConfig();
+  attributeTableConfig.update( mLayer->fields() );
   attributeTableConfig.setActionWidgetStyle( mActionDialog->attributeTableWidgetStyle() );
   QVector<QgsAttributeTableConfig::ColumnConfig> columns = attributeTableConfig.columns();
 

diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -478,3 +478,16 @@ Qt::ItemFlags QgsAttributeTableFilterModel::flags( const QModelIndex& index ) co
   QModelIndex source_index = mapToSource( index );
   return masterModel()->flags( source_index );
 }
+
+QModelIndex QgsAttributeTableFilterModel::index( int row, int column, const QModelIndex& parent ) const
+{
+  if ( column > -1 && mColumnMapping.at( column ) == -1 )
+  {
+    QModelIndex index = QSortFilterProxyModel::index( row, 0, parent );
+    return createIndex( row, column, index.internalPointer() );
+  }
+  else
+  {
+    return QSortFilterProxyModel::index( row, 0, parent );
+  }
+}
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h
@@ -167,7 +167,9 @@ class GUI_EXPORT QgsAttributeTableFilterModel: public QSortFilterProxyModel, pub
 
     virtual QModelIndex mapFromSource( const QModelIndex& sourceIndex ) const override;
 
-    Qt::ItemFlags flags( const QModelIndex &index ) const override;
+    virtual Qt::ItemFlags flags( const QModelIndex &index ) const override;
+
+    virtual QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const override;
 
     /**
      * Sort by the given column using the given order.