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

N890.6 Obsolescence: if the expression defining the flag is evaluated to null, then consider the object as being NOT obsoleted. The workaround implemented in the reference datamodel has been removed (no need to use COALESCE anymore).

Browse Source 
SVN:trunk[4834]
This commit is contained in:
Romain Quetiez
2017-07-13 09:36:57 +00:00
parent e72bc65df8
commit 3c7f5db5e7
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/metamodel.class.php
View File

@@ -333,7 +333,7 @@ abstract class MetaModel
{
self::_check_subclass($sClass);
$sOql = self::$m_aClassParams[$sClass]['obsolescence_expression'];
$oRet = Expression::FromOQL($sOql);
$oRet = Expression::FromOQL("COALESCE($sOql, 0)");
return $oRet;
}
final static public function GetNameSpec($sClass)

14
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -30,7 +30,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
<condition><![CDATA[status = 'inactive']]></condition>
</obsolescence>
</properties>
<fields>
@@ -137,7 +137,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
<condition><![CDATA[status = 'inactive']]></condition>
</obsolescence>
</properties>
<fields>
@@ -897,7 +897,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='obsolete',0)]]></condition>
<condition><![CDATA[status = 'obsolete']]></condition>
</obsolescence>
</properties>
<fields>
@@ -1667,7 +1667,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='obsolete',0)]]></condition>
<condition><![CDATA[status = 'obsolete']]></condition>
</obsolescence>
</properties>
<fields>
@@ -2943,7 +2943,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
<condition><![CDATA[status='inactive']]></condition>
</obsolescence>
</properties>
<fields>
@@ -3102,7 +3102,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
<condition><![CDATA[status = 'inactive']]></condition>
</obsolescence>
</properties>
<fields>
@@ -3228,7 +3228,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='inactive',0)]]></condition>
<condition><![CDATA[status = 'inactive']]></condition>
</obsolescence>
</properties>
<fields>

4
datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
View File

@@ -26,7 +26,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='obsolete',0)]]></condition>
<condition><![CDATA[status = 'obsolete']]></condition>
</obsolescence>
</properties>
<fields>
@@ -283,7 +283,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition><![CDATA[COALESCE(status='obsolete' OR (server_id!=0 AND server_id_obsolescence_flag),0)]]></condition>
<condition><![CDATA[status = 'obsolete' OR (server_id != 0 AND server_id_obsolescence_flag)]]></condition>
</obsolescence>
</properties>
<fields>