Enhance Service locator

This commit is contained in:
Eric Espie
2026-01-27 11:54:05 +01:00
parent 390b5c0bc3
commit bfa7a209d6
43 changed files with 338 additions and 210 deletions

View File

@@ -10,6 +10,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\TurboForm;
use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
use Combodo\iTop\Forms\Block\FormBlockService;
use Combodo\iTop\Forms\Controller\FormsController;
use MetaModel;
use Symfony\Component\Form\FormView;
use utils;
@@ -59,7 +60,8 @@ class TurboFormUIBlockFactory extends AbstractUIBlockFactory
*/
public static function MakeForDashletConfiguration(string $sDashletClass, array $aData = [], string $sId = null): TurboForm
{
$oBlockForm = FormBlockService::GetInstance()->GetFormBlockById($sDashletClass, 'Dashlet');
$oFormBlockService = MetaModel::GetService('FormBlockService');
$oBlockForm = $oFormBlockService->GetFormBlockById($sDashletClass, 'Dashlet');
$oController = new FormsController();
$oBuilder = $oController->GetFormBuilder($oBlockForm, $aData);
$oForm = $oBuilder->getForm();

View File

@@ -3,14 +3,17 @@
namespace Combodo\iTop\Application\UI\Base\Layout\DashletPanel;
use Combodo\iTop\Application\Dashlet\Service\DashletService;
use MetaModel;
class DashletPanelFactory
{
public static function MakeForDashboardEditor(string $sId = null): DashletPanel
{
/** @var DashletService $oDashletService */
$oDashletService = MetaModel::GetService('DashletService');
$oDashletPanel = new DashletPanel($sId);
$aAvailableDashlets = DashletService::GetInstance()->GetAvailableDashlets('can_be_created');
$aAvailableDashlets = $oDashletService->GetAvailableDashlets('can_be_created');
foreach ($aAvailableDashlets as $sDashletClass => $aDashletInformation) {
$oDashletEntry = new DashletEntry($sDashletClass, $aDashletInformation['label'], $aDashletInformation['description'], $aDashletInformation['icon']);