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

Obsoleted the SibusQL and the keyword pkey (still allowed as a placeholder in the templates)

Browse Source 
SVN:trunk[372]
This commit is contained in:
Romain Quetiez
2010-04-29 16:51:56 +00:00
parent f2fd97a434
commit 69a8d27b54
53 changed files with 1171 additions and 2805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pages/audit.php
View File

@@ -17,8 +17,8 @@ function GetRuleResultSet($iRuleId, $oDefinitionFilter)
$oContext = new UserContext();
$oRule = $oContext->GetObject('AuditRule', $iRuleId);
$sSibusql = $oRule->Get('query');
$oRuleFilter = DBObjectSearch::FromSibusQL($sSibusql);
$sOql = $oRule->Get('query');
$oRuleFilter = DBObjectSearch::FromOQL($sOql);
if ($oRule->Get('valid_flag') == 'false')
{
// The query returns directly the invalid elements
@@ -37,7 +37,7 @@ function GetRuleResultSet($iRuleId, $oDefinitionFilter)
$aValidIds[] = $oObj->GetKey();
}
$oFilter = $oDefinitionFilter;
$oFilter->AddCondition('pkey', $aValidIds, 'NOTIN');
$oFilter->AddCondition('id', $aValidIds, 'NOTIN');
$oErrorObjectSet = new CMDBObjectSet($oFilter);
}
return $oErrorObjectSet;
@@ -65,7 +65,7 @@ switch($operation)
$oContext = new UserContext();
$oAuditCategory = $oContext->GetObject('AuditCategory', $iCategory);
$oDefinitionFilter = DBObjectSearch::FromSibusQL($oAuditCategory->Get('definition_set'));
$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
if (!empty($currentOrganization))
{
$oDefinitionFilter->AddCondition('org_id', $currentOrganization);
@@ -94,13 +94,13 @@ switch($operation)
$oP->add("</tr>\n");
while($oAuditCategory = $oCategoriesSet->fetch())
{
$oDefinitionFilter = DBObjectSearch::FromSibusQL($oAuditCategory->Get('definition_set'));
$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
$aObjectsWithErrors = array();
if (!empty($currentOrganization))
{
if (MetaModel::IsValidFilterCode($oDefinitionFilter->GetClass(), 'org_id'))
{
if (MetaModel::IsValidFilterCode($oDefinitionFilter->GetClass(), 'org_id'))
{
$oDefinitionFilter->AddCondition('org_id', $currentOrganization);
$oDefinitionFilter->AddCondition('org_id', $currentOrganization);
}
}
$aResults = array();
@@ -122,7 +122,7 @@ switch($operation)
}
else
{
$oRuleFilter = DBObjectSearch::FromSibusQL($oAuditRule->Get('query'));
$oRuleFilter = DBObjectSearch::FromOQL($oAuditRule->Get('query'));
$oErrorObjectSet = GetRuleResultSet($oAuditRule->GetKey(), $oDefinitionFilter);
$iErrorsCount = $oErrorObjectSet->Count();
while($oObj = $oErrorObjectSet->Fetch())