From bd0480b5c562fb69b1645832ca93a1701929196c Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Tue, 4 Aug 2020 11:34:49 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03233=20-=20Remove=20"display=5Ftemplate"?=
 =?UTF-8?q?=20from=20the=20metamodel=20and=20compiler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/template.class.inc.php   |  2 ++
 core/metamodel.class.php             | 12 ------------
 setup/compiler.class.inc.php         |  6 ------
 setup/itopdesignformat.class.inc.php |  4 +++-
 setup/modelfactory.class.inc.php     |  1 -
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/application/template.class.inc.php b/application/template.class.inc.php
index 5c7fa9315..db880a9d0 100644
--- a/application/template.class.inc.php
+++ b/application/template.class.inc.php
@@ -20,6 +20,8 @@
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages
+ *
+ * @deprecated Since 2.8.0
  */
 class DisplayTemplate
 {
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 0c8cdbd98..c34063333 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -867,18 +867,6 @@ abstract class MetaModel
 		return self::$m_aClassParams[$sClass]["reconc_keys"];
 	}
 
-	/**
-	 * @param string $sClass
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 */
-	final static public function GetDisplayTemplate($sClass)
-	{
-		self::_check_subclass($sClass);
-		return array_key_exists("display_template", self::$m_aClassParams[$sClass]) ? self::$m_aClassParams[$sClass]["display_template"] : '';
-	}
-
 	/**
 	 * @param string $sClass
 	 * @param bool $bOnlyDeclared
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 4b126a3a5..054e6d439 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1081,12 +1081,6 @@ EOF
 		}
 		$aClassParams['db_finalclass_field'] = $this->GetPropString($oProperties, 'db_final_class_field', $sDefaultFinalClass);
 	
-		if (($sDisplayTemplate = $oProperties->GetChildText('display_template')) && (strlen($sDisplayTemplate) > 0))
-		{
-			$sDisplayTemplate = $sModuleRelativeDir.'/'.$sDisplayTemplate;
-			$aClassParams['display_template'] = "utils::GetAbsoluteUrlModulesRoot().'$sDisplayTemplate'";
-		}
-	
 		$this->CompileFiles($oProperties, $sTempTargetDir.'/'.$sModuleRelativeDir, $sFinalTargetDir.'/'.$sModuleRelativeDir, '');
 		if (($sIcon = $oProperties->GetChildText('icon')) && (strlen($sIcon) > 0))
 		{
diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php
index 1f6bedae1..361e45b4c 100644
--- a/setup/itopdesignformat.class.inc.php
+++ b/setup/itopdesignformat.class.inc.php
@@ -770,7 +770,9 @@ class iTopDesignFormat
 	 */
 	protected function From17To18($oFactory)
 	{
-		// Nothing
+		// -- 3233 - Remove "display template" feature from MetaModel
+		$sPath = "/itop_design//class/properties/display_template";
+		$this->RemoveNodeFromXPath($sPath);
 	}
 
 	/**
diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index 38dcd8919..f19c42579 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -1197,7 +1197,6 @@ $sHeader
 	</properties>
 	<naming format=""><attributes/></naming>
 	<reconciliation><attributes/></reconciliation>
-	<display_template/>
 	<icon>$sIcon</icon>
 	</properties>
 	<fields/>