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

N°8772 - PropertyTrees definition in DataModel

Browse Source
This commit is contained in:
Eric Espie
2025-12-15 16:19:22 +01:00
parent eff59a93fd
commit a77e54c8cb
9 changed files with 250 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/Forms/Block/FormBlockService.php
View File

@@ -13,9 +13,11 @@ use Combodo\iTop\Service\Cache\DataModelDependantCache;
use Combodo\iTop\Service\DependencyInjection\DIService;
use ModelReflection;
use ModelReflectionRuntime;
use utils;
class FormBlockService
{
public const CACHE_POOL = 'Forms';
private static FormBlockService $oInstance;
private DataModelDependantCache $oCacheService;
@@ -36,22 +38,29 @@ class FormBlockService
/**
* @param string $sId name of the form to retrieve
* @param string $sType
*
* @return \Combodo\iTop\Forms\Block\Base\FormBlock
* @throws \Combodo\iTop\Forms\Block\FormBlockException
* @throws \Combodo\iTop\Forms\Compiler\FormsCompilerException
* @throws \Combodo\iTop\PropertyTree\PropertyTreeException
* @throws \DOMFormatException
*/
public function GetFormBlockById(string $sId): FormBlock
public function GetFormBlockById(string $sId, string $sType): FormBlock
{
$sFilteredId = preg_replace('/[^0-9a-zA-Z_]/', '', $sId);
if (strlen($sFilteredId) === 0) {
throw new FormBlockException('Malformed name for block: '.json_encode($sId));
}
if (!$this->oCacheService->HasEntry(FormsCompiler::CACHE_POOL, $sFilteredId)) {
throw new FormBlockException('No block found for: '.json_encode($sFilteredId).' original value asked: '.json_encode($sId));
if (!$this->oCacheService->HasEntry(self::CACHE_POOL, $sFilteredId) || utils::IsDevelopmentEnvironment()) {
// Cache not found, compile the form
$sPHPContent = FormsCompiler::GetInstance()->CompileForm($sFilteredId, $sType);
$this->oCacheService->StorePhpContent(FormBlockService::CACHE_POOL, $sId, "<?php\n\n$sPHPContent");
}
$this->oCacheService->Fetch(FormsCompiler::CACHE_POOL, $sFilteredId);
$this->oCacheService->Fetch(self::CACHE_POOL, $sFilteredId);
$sFormBlockClass = 'FormFor__'.$sFilteredId;
return new $sFilteredId($sFilteredId);
return new $sFormBlockClass($sFilteredId);
}
}