composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-06 17:44:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finalized the concept of abstract classes (#35) in the core. Still to be used within the UI.

Browse Source 
SVN:trunk[378]
This commit is contained in:
Romain Quetiez
2010-04-30 16:42:08 +00:00
parent a980d043c0
commit e651c84331
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/itop.business.class.inc.php
View File

@@ -496,7 +496,7 @@ class lnkContactRealObject extends cmdbAbstractObject
* can be part of an GroupInfra
*/
////////////////////////////////////////////////////////////////////////////////////
class logInfra extends logRealObject
abstract class logInfra extends logRealObject
{
public static function Init()
{

42
core/metamodel.class.php
View File

@@ -331,7 +331,7 @@ abstract class MetaModel
$aTables = array();
foreach (self::GetClasses() as $sClass)
{
if (self::IsAbstract($sClass)) continue;
if (!self::HasTable($sClass)) continue;
$sTable = self::DBGetTable($sClass);
// Could be completed later with all the classes that are using a given table
@@ -1262,10 +1262,16 @@ abstract class MetaModel
return array();
}
public static function HasTable($sClass)
{
if (strlen(self::DBGetTable($sClass)) == 0) return false;
return true;
}
public static function IsAbstract($sClass)
{
if (strlen(self::DBGetTable($sClass)) == 0) return true;
return false;
$oReflection = new ReflectionClass($sClass);
return $oReflection->isAbstract();
}
protected static $m_aQueryStructCache = array();
@@ -1790,8 +1796,6 @@ abstract class MetaModel
$aSugFix = array();
foreach (self::GetClasses() as $sClass)
{
if (self::IsAbstract($sClass)) continue;
$sNameAttCode = self::GetNameAttributeCode($sClass);
if (empty($sNameAttCode))
{
@@ -1806,12 +1810,15 @@ abstract class MetaModel
}
foreach(self::GetReconcKeys($sClass) as $sReconcKeyAttCode)
if (!empty($sReconcKeyAttCode) && !self::IsValidAttCode($sClass, $sReconcKeyAttCode))
{
$aErrors[$sClass][] = "Unkown attribute code '".$sReconcKeyAttCode."' in the list of reconciliation keys";
$aSugFix[$sClass][] = "Expecting a value in ".implode(", ", self::GetAttributesList($sClass));
if (!empty($sReconcKeyAttCode) && !self::IsValidAttCode($sClass, $sReconcKeyAttCode))
{
$aErrors[$sClass][] = "Unkown attribute code '".$sReconcKeyAttCode."' in the list of reconciliation keys";
$aSugFix[$sClass][] = "Expecting a value in ".implode(", ", self::GetAttributesList($sClass));
}
}
$bHasWritableAttribute = false;
foreach(self::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
{
// It makes no sense to check the attributes again and again in the subclasses
@@ -1872,6 +1879,7 @@ abstract class MetaModel
// Check dependencies
if ($oAttDef->IsWritable())
{
$bHasWritableAttribute = true;
foreach ($oAttDef->GetPrerequisiteAttributes() as $sDependOnAttCode)
{
if (!self::IsValidAttCode($sClass, $sDependOnAttCode))
@@ -1959,6 +1967,16 @@ abstract class MetaModel
}
}
if ($bHasWritableAttribute)
{
if (!self::HasTable($sClass))
{
$aErrors[$sClass][] = "No table has been defined for this class";
$aSugFix[$sClass][] = "Either define a table name or move the attributes elsewhere";
}
}
// ZList
//
foreach(self::EnumZLists() as $sListCode)
@@ -2186,7 +2204,7 @@ abstract class MetaModel
$sRes .= "\n";
foreach (self::GetClasses($sCategory) as $sClass)
{
if (self::IsAbstract($sClass)) continue;
if (!self::HasTable($sClass)) continue;
$bNotInDico = false;
@@ -2264,7 +2282,7 @@ abstract class MetaModel
$aSugFix = array();
foreach (self::GetClasses() as $sClass)
{
if (self::IsAbstract($sClass)) continue;
if (!self::HasTable($sClass)) continue;
// Check that the table exists
//
@@ -2496,7 +2514,7 @@ abstract class MetaModel
{
foreach (self::GetClasses() as $sClass)
{
if (self::IsAbstract($sClass)) continue;
if (!self::HasTable($sClass)) continue;
$sRootClass = self::GetRootClass($sClass);
$sTable = self::DBGetTable($sClass);
$sKeyField = self::DBGetKey($sClass);
@@ -2705,7 +2723,7 @@ abstract class MetaModel
$aTable2ClassProp = array();
foreach (self::GetClasses() as $sClass)
{
if (self::IsAbstract($sClass)) continue;
if (!self::HasTable($sClass)) continue;
$sRootClass = self::GetRootClass($sClass);
$sTable = self::DBGetTable($sClass);

2
core/test.class.inc.php
View File

@@ -538,7 +538,7 @@ abstract class TestBizModelGeneric extends TestBizModel
{
foreach(MetaModel::GetClasses() as $sClassName)
{
if (MetaModel::IsAbstract($sClassName)) continue;
if (MetaModel::HasTable($sClassName)) continue;
$oNobody = MetaModel::GetObject($sClassName, 123);
$oBaby = new $sClassName;

8
pages/schema.php
View File

@@ -302,6 +302,14 @@ function DisplayClassesList($oPage)
function DisplayClassDetails($oPage, $sClass)
{
$oPage->p("<h2>$sClass</h2><br/>\n".MetaModel::GetClassDescription($sClass)."<br/>\n");
if (MetaModel::IsAbstract($sClass))
{
$oPage->p("Abstract class: could not be instantiated");
}
else
{
$oPage->p("Not abstract: could be instantiated");
}
$oPage->p("<h3>Class Hierarchy</h3>");
$oPage->p("[<a href=\"?operation='list'\">All classes</a>]");
// List the parent classes