composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01: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

10
pages/ajax.render.php
View File

@@ -107,9 +107,9 @@ switch($operation)
{
$aExtraParams = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
}
if ($sEncoding == 'sibusql')
if ($sEncoding == 'oql')
{
$oFilter = CMDBSearchFilter::FromSibusQL($sFilter);
$oFilter = CMDBSearchFilter::FromOQL($sFilter);
}
else
{
@@ -127,7 +127,7 @@ switch($operation)
case 'details':
$key = utils::ReadParam('id', 0);
$oFilter = $oContext->NewFilter($sClass);
$oFilter->AddCondition('pkey', $key, '=');
$oFilter->AddCondition('id', $key, '=');
$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
$oDisplayBlock->RenderContent($oPage);
break;
@@ -135,7 +135,7 @@ switch($operation)
case 'preview':
$key = utils::ReadParam('id', 0);
$oFilter = $oContext->NewFilter($sClass);
$oFilter->AddCondition('pkey', $key, '=');
$oFilter->AddCondition('id', $key, '=');
$oDisplayBlock = new DisplayBlock($oFilter, 'preview', false);
$oDisplayBlock->RenderContent($oPage);
break;
@@ -187,7 +187,7 @@ switch($operation)
case 'modal_details':
$key = utils::ReadParam('id', 0);
$oFilter = $oContext->NewFilter($sClass);
$oFilter->AddCondition('pkey', $key, '=');
$oFilter->AddCondition('id', $key, '=');
$oPage->Add("<p style=\"width:100%; margin-top:-5px;padding:3px; background-color:#33f; color:#fff;\">Object Details</p>\n");
$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
$oDisplayBlock->RenderContent($oPage);