composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

✅ Fix CI

Browse Source
This commit is contained in:
Eric Espie
2026-01-28 15:59:56 +01:00
parent bb1c4f865a
commit d7451fe2ea
13 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Application/Dashboard/Controller/DashboardController.php
View File

@@ -39,11 +39,13 @@ class DashboardController extends Controller
public const ROUTE_NAMESPACE = 'dashboard';
private FormBlockService $oFormBlockService;
private XMLSerializer $oXMLSerializer;
public function __construct($sViewPath = '', $sModuleName = 'core', $aAdditionalPaths = [], array $aThemes = ['application/forms/itop_console_layout.html.twig', 'application/forms/wip_form_demonstrator.html.twig'])
{
parent::__construct($sViewPath, $sModuleName, $aAdditionalPaths, $aThemes);
$this->oFormBlockService = MetaModel::GetService('FormBlockService');
$this->oXMLSerializer = MetaModel::GetService('XMLSerializer');
}
public function OperationGetDashlet()
@@ -124,7 +126,7 @@ class DashboardController extends Controller
$aModelData = $oForm->getData();
$oDashboard = new RuntimeDashboard($aModelData['id']);
$oDomNode = $oDashboard->CreateEmptyDashboard();
XMLSerializer::GetInstance()->Serialize($aModelData, $oDomNode, 'DashboardGrid', 'Dashboard');
$this->oXMLSerializer->Serialize($aModelData, $oDomNode, 'DashboardGrid', 'Dashboard');
$sXml = $oDomNode->ownerDocument->saveXML();
$oDashboard->PersistDashboard($sXml);
$sStatus = 'ok';

5
sources/Application/Dashboard/Dashboard.php
View File

@@ -56,6 +56,8 @@ abstract class Dashboard
protected $oDashletFactory;
private XMLSerializer $oXMLSerializer;
/**
* Dashboard constructor.
*
@@ -71,6 +73,7 @@ abstract class Dashboard
$this->oDOMNode = null;
$this->sId = $sId;
$this->oDashletFactory = DashletFactory::GetInstance();
$this->oXMLSerializer = MetaModel::GetService('XMLSerializer');
}
/**
@@ -170,7 +173,7 @@ abstract class Dashboard
*/
public function FromDOMDocumentV2(DesignElement $oDOMNode)
{
$aDashboardValues = XMLSerializer::GetInstance()->Deserialize($oDOMNode, 'DashboardGrid', 'Dashboard');
$aDashboardValues = $this->oXMLSerializer->Deserialize($oDOMNode, 'DashboardGrid', 'Dashboard');
$this->FromModelData($aDashboardValues);
}

2
sources/Application/Dashboard/FormBlock/DashletFormBlock.php
View File

@@ -14,8 +14,8 @@ class DashletFormBlock extends FormBlock
public function __construct(string $sName, array $aOptions = [])
{
parent::__construct($sName, $aOptions);
$this->oPropertyTypeService = MetaModel::GetService('PropertyTypeService');
parent::__construct($sName, $aOptions);
}
protected function BuildForm(): void