From 1da33effd8c6fc1ec1c4e2f9d73b583d320efe64 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Tue, 17 Jan 2012 16:13:12 +0000
Subject: [PATCH] Dehardcoded the datamodel source files from the subdirectory
 "modules" - updated the compiler to take this into account

SVN:trunk[1781]
---
 setup/compiler.class.inc.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 49f857908..d41d937c1 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -144,7 +144,7 @@ EOF;
 					$sClass = $oClass->getAttribute("name");
 					try
 					{
-						$this->CompileClass($oClass, $sResultFile, $oP);
+						$this->CompileClass($oClass, $sResultFile, $sRelativeDir, $oP);
 					}
 					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');
 		$oProperties = $this->GetUniqueElement($oClass, 'properties');
@@ -396,15 +396,15 @@ EOF;
 		$oDisplayTemplate = $this->GetOptionalElement($oProperties, 'display_template');
 		if ($oDisplayTemplate)
 		{
-			$sDisplayTemplate = $oDisplayTemplate->textContent;
-			$aClassParams['display_template'] = "'$sDisplayTemplate'";
+			$sDisplayTemplate = $sModuleRelativeDir.'/'.$oDisplayTemplate->textContent;
+			$aClassParams['display_template'] = "utils::GetAbsoluteUrlModulesRoot().'$sDisplayTemplate'";
 		}
 	
 		$oIcon = $this->GetOptionalElement($oProperties, 'icon');
 		if ($oIcon)
 		{
-			$sIcon = $oIcon->textContent;
-			$aClassParams['icon'] = "'$sIcon'";
+			$sIcon = $sModuleRelativeDir.'/'.$oIcon->textContent;
+			$aClassParams['icon'] = "utils::GetAbsoluteUrlModulesRoot().'$sIcon'";
 		}
 	
 		// Finalize class params declaration