Fix executing processing scripts through script editor

nyalldawson · nyalldawson · commit 54f9846edab1 · 2018-01-24T15:53:33.000+11:00
diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py
@@ -274,7 +274,8 @@ def setHasChanged(self, hasChanged):
 
     def runAlgorithm(self):
         if self.algType == self.SCRIPT_PYTHON:
-            alg = ScriptAlgorithm(None, self.editor.text())
+            alg = ScriptAlgorithm(None, script=self.editor.text())
+            alg.setProvider(QgsApplication.processingRegistry().providerById('script'))
 
         dlg = alg.createCustomParametersWidget(self)
         if not dlg:
diff --git a/python/plugins/processing/script/ScriptAlgorithm.py b/python/plugins/processing/script/ScriptAlgorithm.py
@@ -79,7 +79,10 @@ def __init__(self, descriptionFile, script=None):
         self.results = {}
 
     def createInstance(self):
-        return ScriptAlgorithm(self.descriptionFile)
+        if self.descriptionFile is not None:
+            return ScriptAlgorithm(self.descriptionFile)
+        else:
+            return ScriptAlgorithm(descriptionFile=None, script=self.script)
 
     def initAlgorithm(self, config=None):
         pass
@@ -120,7 +123,7 @@ def defineCharacteristicsFromFile(self):
                     try:
                         self.processParameterLine(line.strip('\n'))
                     except:
-                        self.error = self.tr('This script has a syntax errors.\n'
+                        self.error = self.tr('This script has a syntax error.\n'
                                              'Problem with line: {0}', 'ScriptAlgorithm').format(line)
                 self.script += line
                 line = lines.readline()
