Fix #12183 - avoid error message in fieldsmapper when no field type s…

…elected
qgis · Feb 11, 2015 · ed94aff · ed94aff
1 parent f76d730
commit ed94aff
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py b/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
@@ -132,7 +132,7 @@ def data(self, index, role=QtCore.Qt.DisplayRole):
 
             fieldType = column_def['type']
             if fieldType == QtCore.QVariant.Type:
-                if value == 0:
+                if value == QtCore.QVariant.Invalid:
                     return ''
                 return self.fieldTypes[value]
             return value
@@ -277,6 +277,8 @@ def setModelData(self, editor, model, index):
         fieldType = FieldsMappingModel.columns[column]['type']
         if fieldType == QtCore.QVariant.Type:
             value = editor.itemData(editor.currentIndex())
+            if value is None:
+                value = QtCore.QVariant.Invalid
             model.setData(index, value)
 
         elif fieldType == QgsExpression: