Merge pull request #2058 from arnaud-morvan/processing-model-help

Fix processing model help saving
qgis · May 22, 2015 · 5c3a7af · 5c3a7af
2 parents f5054ce + c19a4a7
commit 5c3a7af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/python/plugins/processing/gui/HelpEditionDialog.py b/python/plugins/processing/gui/HelpEditionDialog.py
@@ -80,21 +80,6 @@ def reject(self):
 
     def accept(self):
         self.descriptions[self.currentName] = unicode(self.text.toPlainText())
-        if isinstance(self.alg, ModelerAlgorithm):
-            self.alg.helpContent = self.descriptions
-        else:
-            if self.alg.descriptionFile is not None:
-                try:
-                    with open(self.alg.descriptionFile + '.help', 'w') as f:
-                        json.dump(self.descriptions, f)
-                except Exception, e:
-                    QMessageBox.warning(self, self.tr('Error saving help file'),
-                        self.tr('Help file could not be saved.\n'
-                                'Check that you have permission to modify the help\n'
-                                'file. You might not have permission if you are \n'
-                                'editing an example model or script, since they \n'
-                                'are stored on the installation folder'))
-
         QDialog.accept(self)
 
     def getHtml(self):

diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py
@@ -168,11 +168,9 @@ def editHelp(self):
 
         dlg = HelpEditionDialog(alg)
         dlg.exec_()
-
-        # We store the description string in case there were not saved
-        # because there was no filename defined yet
-        if self.alg is None and dlg.descriptions:
+        if dlg.descriptions:
             self.help = dlg.descriptions
+            self.setHasChanged(True)
 
     def openScript(self):
         if self.hasChanged:

diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py
@@ -226,6 +226,7 @@ def editHelp(self):
         dlg = HelpEditionDialog(alg)
         dlg.exec_()
         if dlg.descriptions:
+            self.alg.helpContent = dlg.descriptions
             self.hasChanged = True
 
     def runModel(self):