diff --git a/python/plugins/processing/gui/wrappers.py b/python/plugins/processing/gui/wrappers.py index f9b4bca4545..92491c28b43 100644 --- a/python/plugins/processing/gui/wrappers.py +++ b/python/plugins/processing/gui/wrappers.py @@ -36,7 +36,7 @@ from functools import cmp_to_key from qgis.core import QgsCoordinateReferenceSystem, QgsVectorLayer from qgis.PyQt.QtWidgets import QCheckBox, QComboBox, QLineEdit, QPlainTextEdit -from qgis.gui import QgsFieldExpressionWidget +from qgis.gui import QgsFieldExpressionWidget, QgsExpressionLineEdit from qgis.PyQt.QtCore import pyqtSignal, QObject, QVariant from processing.gui.NumberInputPanel import NumberInputPanel @@ -714,7 +714,10 @@ class ExpressionWidgetWrapper(WidgetWrapper): def createWidget(self): if self.dialogType in (DIALOG_STANDARD, DIALOG_BATCH): - widget = QgsFieldExpressionWidget() + if self.param.parent_layer: + widget = QgsFieldExpressionWidget() + else: + widget = QgsExpressionLineEdit() if self.param.default: widget.setExpression(self.param.default) else: diff --git a/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py b/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py index 08b3c51ac56..93dc8b727d6 100644 --- a/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py +++ b/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py @@ -210,7 +210,8 @@ class ModelerParameterDefinitionDialog(QDialog): self.verticalLayout.addWidget(QLabel(self.tr('Parent layer'))) self.parentCombo = QComboBox() - idx = 0 + self.parentCombo.addItem(self.tr("None"), None) + idx = 1 for param in list(self.alg.inputs.values()): if isinstance(param.param, (ParameterVector, ParameterTable)): self.parentCombo.addItem(param.param.description, param.param.name)