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

Dehardcoded the datamodel source files from the subdirectory "modules" - updated the compiler to take this into account

Browse Source 
SVN:trunk[1781]
This commit is contained in:
Romain Quetiez
2012-01-17 16:13:12 +00:00
parent f253b10ddd
commit 1da33effd8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ EOF;
$sClass = $oClass->getAttribute("name"); $sClass = $oClass->getAttribute("name");
try try
{ {
$this->CompileClass($oClass, $sResultFile, $oP); $this->CompileClass($oClass, $sResultFile, $sRelativeDir, $oP);
} }
catch (ssDOMFormatException $e) catch (ssDOMFormatException $e)
{ {
@@ -333,7 +333,7 @@ EOF;
} }
protected function CompileClass($oClass, $sResFile, $oP) protected function CompileClass($oClass, $sResFile, $sModuleRelativeDir, $oP)
{ {
$sClass = $oClass->getAttribute('name'); $sClass = $oClass->getAttribute('name');
$oProperties = $this->GetUniqueElement($oClass, 'properties'); $oProperties = $this->GetUniqueElement($oClass, 'properties');
@@ -396,15 +396,15 @@ EOF;
$oDisplayTemplate = $this->GetOptionalElement($oProperties, 'display_template'); $oDisplayTemplate = $this->GetOptionalElement($oProperties, 'display_template');
if ($oDisplayTemplate) if ($oDisplayTemplate)
{ {
$sDisplayTemplate = $oDisplayTemplate->textContent; $sDisplayTemplate = $sModuleRelativeDir.'/'.$oDisplayTemplate->textContent;
$aClassParams['display_template'] = "'$sDisplayTemplate'"; $aClassParams['display_template'] = "utils::GetAbsoluteUrlModulesRoot().'$sDisplayTemplate'";
} }
$oIcon = $this->GetOptionalElement($oProperties, 'icon'); $oIcon = $this->GetOptionalElement($oProperties, 'icon');
if ($oIcon) if ($oIcon)
{ {
$sIcon = $oIcon->textContent; $sIcon = $sModuleRelativeDir.'/'.$oIcon->textContent;
$aClassParams['icon'] = "'$sIcon'"; $aClassParams['icon'] = "utils::GetAbsoluteUrlModulesRoot().'$sIcon'";
} }
// Finalize class params declaration // Finalize class params declaration