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

N°8760 - rename GetCreatedIn <- GetModuleName + compute module name live instead having complex stuff in MetaModel/compilation

Browse Source
This commit is contained in:
odain
2026-01-27 17:26:16 +01:00
parent 02ea17d897
commit 54c7af1140
6 changed files with 45 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/compiler.class.inc.php
View File

@@ -477,7 +477,7 @@ class MFCompiler
$sClass = $oClass->getAttribute("id");
$aAllClasses[] = $sClass;
try {
$sCompiledCode .= $this->CompileClass($oClass, $sModuleName, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
} catch (DOMFormatException $e) {
$sMessage = "Failed to process class '$sClass', ";
if (!empty($sModuleRootDir)) {
@@ -626,7 +626,7 @@ EOF;
// files to include (PHP datamodels)
foreach ($oModule->GetFilesToInclude('business') as $sRelFileName) {
if (file_exists("{$sTempTargetDir}/{$sRelativeDir}/{$sRelFileName}")) {
$aDataModelFiles[] = sprintf("MetaModel::IncludeModule(MODULESROOT.'/$sRelativeDir/$sRelFileName', null, '%s');", $oModule->GetName());
$aDataModelFiles[] = "MetaModel::IncludeModule(MODULESROOT.'/$sRelativeDir/$sRelFileName');";
} else {
/** @noinspection NestedPositiveIfStatementsInspection */
if (utils::IsDevelopmentEnvironment()) {
@@ -643,7 +643,7 @@ EOF;
}
// files to include (PHP webservices providers)
foreach ($oModule->GetFilesToInclude('webservices') as $sRelFileName) {
$aWebservicesFiles[] = sprintf("MetaModel::IncludeModule(MODULESROOT.'/$sRelativeDir/$sRelFileName', null, '%s');", $oModule->GetName());
$aWebservicesFiles[] = "MetaModel::IncludeModule(MODULESROOT.'/$sRelativeDir/$sRelFileName');";
}
} // foreach module
@@ -1189,7 +1189,6 @@ EOF
/**
* @param \MFElement $oClass
* @param string $sModuleName
* @param string $sTempTargetDir
* @param string $sFinalTargetDir
* @param string $sModuleRelativeDir
@@ -1197,7 +1196,7 @@ EOF
* @return string
* @throws \DOMFormatException
*/
protected function CompileClass($oClass, $sModuleName, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir)
protected function CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir)
{
$sClass = $oClass->getAttribute('id');
$oProperties = $oClass->GetUniqueElement('properties');
@@ -1210,7 +1209,6 @@ EOF
$aClassParams = [];
$aClassParams['category'] = $this->GetPropString($oProperties, 'category', '');
$aClassParams['key_type'] = "'autoincrement'";
$aClassParams['created_in'] = "'$sModuleName'";
if ((bool)$this->GetPropNumber($oProperties, 'is_link', 0)) {
$aClassParams['is_link'] = 'true';
}