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

AttributeDashboard support Dashlet Badge in XML files (fix the <class> collision)

Browse Source
This commit is contained in:
Eric
2018-10-23 15:53:14 +02:00
parent 0021482c1b
commit 32fc87023c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,8 +289,7 @@ class MFCompiler
$aAllClasses[] = $sClass;
try
{
$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir,
$sRelativeDir);
$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
}
catch (DOMFormatException $e)
{

6
setup/modelfactory.class.inc.php
View File

@@ -1188,7 +1188,7 @@ EOF
*/
public function ListClasses($sModuleName)
{
return $this->GetNodes("/itop_design/classes//class[@_created_in='$sModuleName']");
return $this->GetNodes("/itop_design/classes//class[@id][@_created_in='$sModuleName']");
}
/**
@@ -1197,7 +1197,7 @@ EOF
*/
public function ListAllClasses()
{
return $this->GetNodes("/itop_design/classes//class");
return $this->GetNodes("/itop_design/classes//class[@id]");
}
/**
@@ -1206,7 +1206,7 @@ EOF
*/
public function ListRootClasses()
{
return $this->GetNodes("/itop_design/classes/class/class[class]");
return $this->GetNodes("/itop_design/classes/class/class[@id][class]");
}
/**