[app][bugfix] Update layer editable state when filter is changed

elpaso · elpaso · commit d775a0d97aa9 · 2017-11-22T09:21:08.000+01:00
Fixes #17507
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8940,6 +8940,7 @@ void QgisApp::layerSubsetString()
   if ( qb->exec() && ( subsetBefore != qb->sql() ) && mLayerTreeView )
   {
     mLayerTreeView->refreshLayerSymbology( vlayer->id() );
+    activateDeactivateLayerRelatedActions( vlayer );
   }
 }
 
@@ -11089,14 +11090,13 @@ void QgisApp::layersWereAdded( const QList<QgsMapLayer *> &layers )
       connect( vlayer, &QgsVectorLayer::labelingFontNotFound, this, &QgisApp::labelingFontNotFound );
 
       QgsVectorDataProvider *vProvider = vlayer->dataProvider();
-      if ( vProvider && vProvider->capabilities() & QgsVectorDataProvider::EditingCapabilities )
-      {
-        connect( vlayer, &QgsVectorLayer::layerModified, this, &QgisApp::updateLayerModifiedActions );
-        connect( vlayer, &QgsVectorLayer::editingStarted, this, &QgisApp::layerEditStateChanged );
-        connect( vlayer, &QgsVectorLayer::editingStopped, this, &QgisApp::layerEditStateChanged );
-        connect( vlayer, &QgsVectorLayer::readOnlyChanged, this, &QgisApp::layerEditStateChanged );
-      }
-
+      // Do not check for layer editing capabilities because they may change
+      // (for example when subsetString is added/removed) and signals need to
+      // be in place in order to update the GUI
+      connect( vlayer, &QgsVectorLayer::layerModified, this, &QgisApp::updateLayerModifiedActions );
+      connect( vlayer, &QgsVectorLayer::editingStarted, this, &QgisApp::layerEditStateChanged );
+      connect( vlayer, &QgsVectorLayer::editingStopped, this, &QgisApp::layerEditStateChanged );
+      connect( vlayer, &QgsVectorLayer::readOnlyChanged, this, &QgisApp::layerEditStateChanged );
       connect( vlayer, &QgsVectorLayer::raiseError, this, &QgisApp::onLayerError );
 
       provider = vProvider;
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -689,7 +689,13 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! mark project dirty
     void markDirty();
 
-    void layersWereAdded( const QList<QgsMapLayer *> & );
+    /**
+     * \brief layersWereAdded is triggered when layers were added
+     * This method loops through the list of \a layers and connect all
+     * application signals that need to listen to layer events.
+     * \param layers list of map layers that have been added
+     */
+    void layersWereAdded( const QList<QgsMapLayer *> &layers );
 
     /* layer will be removed - changed from removingLayer to removingLayers
        in 1.8.
diff --git a/src/app/qgsapplayertreeviewmenuprovider.cpp b/src/app/qgsapplayertreeviewmenuprovider.cpp
@@ -226,6 +226,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
           {
             menu->addAction( toggleEditingAction );
             toggleEditingAction->setChecked( vlayer->isEditable() );
+            toggleEditingAction->setEnabled( true );
           }
           if ( saveLayerEditsAction && vlayer->isModified() )
           {

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()`
`226`	`226`	`{`
`227`	`227`	`menu->addAction( toggleEditingAction );`
`228`	`228`	`toggleEditingAction->setChecked( vlayer->isEditable() );`
	`229`	`+ toggleEditingAction->setEnabled( true );`
`229`	`230`	`}`
`230`	`231`	`if ( saveLayerEditsAction && vlayer->isModified() )`
`231`	`232`	`{`