mirror of
https://github.com/qgis/QGIS.git
synced 2025-03-01 00:46:20 -05:00
Merge pull request #2058 from arnaud-morvan/processing-model-help
Fix processing model help saving
This commit is contained in:
commit
5c3a7af532
@ -80,21 +80,6 @@ class HelpEditionDialog(BASE, WIDGET):
|
||||
|
||||
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):
|
||||
|
@ -168,11 +168,9 @@ class ScriptEditorDialog(BASE, WIDGET):
|
||||
|
||||
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:
|
||||
|
@ -226,6 +226,7 @@ class ModelerDialog(BASE, WIDGET):
|
||||
dlg = HelpEditionDialog(alg)
|
||||
dlg.exec_()
|
||||
if dlg.descriptions:
|
||||
self.alg.helpContent = dlg.descriptions
|
||||
self.hasChanged = True
|
||||
|
||||
def runModel(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user