composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
#	datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
This commit is contained in:
Pierre Goiffon
2021-11-26 17:22:19 +01:00
parent c40394638a 4db5d4c08d
commit 74fbd12709
7 changed files with 84 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/Form/FormManager.php
View File

@@ -40,7 +40,8 @@ abstract class FormManager
* - formrenderer_class : The class of the FormRenderer to use in the FormManager
* - formrenderer_endpoint : The endpoint of the renderer
*
* @param string $sJson
* @param string|string[] $sJson
*
* @return $this
*/
static function FromJSON($sJson)