[Processing] Fix isEnabled check for modeler context menu actions

This aligns the check with Processing scripts context menu actions and allows subclasses of QgsProcessingModelAlgorithm to register their own actions.
qgis · Feb 12, 2020 · 550c8bf · 550c8bf
1 parent 2024fb5
commit 550c8bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/python/plugins/processing/modeler/DeleteModelAction.py b/python/plugins/processing/modeler/DeleteModelAction.py
@@ -23,7 +23,7 @@
 
 import os
 from qgis.core import (QgsApplication,
-                       QgsProcessingModelAlgorithm,
+                       QgsProcessingAlgorithm,
                        QgsProject)
 from qgis.PyQt.QtWidgets import QMessageBox
 from qgis.PyQt.QtCore import QCoreApplication
@@ -38,7 +38,7 @@ def __init__(self):
         self.name = QCoreApplication.translate('DeleteModelAction', 'Delete Model…')
 
     def isEnabled(self):
-        return isinstance(self.itemData, QgsProcessingModelAlgorithm)
+        return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "model"
 
     def execute(self):
         model = self.itemData

diff --git a/python/plugins/processing/modeler/EditModelAction.py b/python/plugins/processing/modeler/EditModelAction.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2012, Victor Olaya'
 
 from qgis.PyQt.QtCore import QCoreApplication
-from qgis.core import QgsApplication, QgsProcessingModelAlgorithm, QgsMessageLog
+from qgis.core import QgsApplication, QgsProcessingAlgorithm
 from processing.gui.ContextAction import ContextAction
 from processing.modeler.ModelerDialog import ModelerDialog
 from qgis.core import Qgis
@@ -36,7 +36,7 @@ def __init__(self):
         self.name = QCoreApplication.translate('EditModelAction', 'Edit Model…')
 
     def isEnabled(self):
-        return isinstance(self.itemData, QgsProcessingModelAlgorithm)
+        return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "model"
 
     def execute(self):
         alg = self.itemData

diff --git a/python/plugins/processing/modeler/ExportModelAsPythonScriptAction.py b/python/plugins/processing/modeler/ExportModelAsPythonScriptAction.py
@@ -22,7 +22,7 @@
 __copyright__ = '(C) 2019, Nyall Dawson'
 
 from qgis.PyQt.QtCore import QCoreApplication
-from qgis.core import QgsProcessingModelAlgorithm, QgsProcessing, QgsApplication
+from qgis.core import QgsProcessingAlgorithm, QgsProcessing, QgsApplication
 from processing.gui.ContextAction import ContextAction
 from processing.script.ScriptEditorDialog import ScriptEditorDialog
 
@@ -34,7 +34,7 @@ def __init__(self):
         self.name = QCoreApplication.translate('ExportModelAsPythonScriptAction', 'Export Model as Python Algorithm…')
 
     def isEnabled(self):
-        return isinstance(self.itemData, QgsProcessingModelAlgorithm)
+        return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "model"
 
     def icon(self):
         return QgsApplication.getThemeIcon('/mActionSaveAsPython.svg')