[processing] use groupId when constructing help URL

alexbruy · alexbruy · commit a0ce648175b9 · 2017-12-15T12:11:46.000+02:00
diff --git a/python/plugins/processing/modeler/ModelerParametersDialog.py b/python/plugins/processing/modeler/ModelerParametersDialog.py
@@ -364,8 +364,8 @@ def cancelPressed(self):
     def openHelp(self):
         algHelp = self._alg.helpUrl()
         if not algHelp:
-            algHelp = QgsHelp.helpUrl("processing_algs/{}/{}".format(
-                self._alg.provider().id(), self._alg.id())).toString()
+            algHelp = QgsHelp.helpUrl("processing_algs/{}/{}.html{}".format(
+                self._alg.provider().id(), self._alg.groupId(), self._alg.name())).toString()
 
         if algHelp not in [None, ""]:
             webbrowser.open(algHelp)
diff --git a/src/gui/processing/qgsprocessingalgorithmdialogbase.cpp b/src/gui/processing/qgsprocessingalgorithmdialogbase.cpp
@@ -230,7 +230,7 @@ void QgsProcessingAlgorithmDialogBase::openHelp()
   QUrl algHelp = mAlgorithm->helpUrl();
   if ( algHelp.isEmpty() )
   {
-    algHelp = QgsHelp::helpUrl( QStringLiteral( "processing_algs/%1/%2" ).arg( mAlgorithm->provider()->id(), mAlgorithm->id() ) );
+    algHelp = QgsHelp::helpUrl( QStringLiteral( "processing_algs/%1/%2.html#%3" ).arg( mAlgorithm->provider()->id(), mAlgorithm->groupId(), mAlgorithm->name() ) );
   }
 
   if ( !algHelp.isEmpty() )

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ void QgsProcessingAlgorithmDialogBase::openHelp()`
`230`	`230`	`QUrl algHelp = mAlgorithm->helpUrl();`
`231`	`231`	`if ( algHelp.isEmpty() )`
`232`	`232`	`{`
`233`		`- algHelp = QgsHelp::helpUrl( QStringLiteral( "processing_algs/%1/%2" ).arg( mAlgorithm->provider()->id(), mAlgorithm->id() ) );`
	`233`	`+ algHelp = QgsHelp::helpUrl( QStringLiteral( "processing_algs/%1/%2.html#%3" ).arg( mAlgorithm->provider()->id(), mAlgorithm->groupId(), mAlgorithm->name() ) );`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if ( !algHelp.isEmpty() )`