composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +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

10
core/valuesetdef.class.inc.php
View File

@@ -78,7 +78,7 @@ abstract class ValueSetDefinition
*/
class ValueSetObjects extends ValueSetDefinition
{
protected $m_sFilterExpr; // in SibuSQL
protected $m_sFilterExpr; // in OQL
protected $m_sValueAttCode;
protected $m_aOrderBy;
@@ -93,7 +93,7 @@ class ValueSetObjects extends ValueSetDefinition
{
$this->m_aValues = array();
$oFilter = DBObjectSearch::FromSibusQL($this->m_sFilterExpr, $aArgs);
$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr, $aArgs);
if (!$oFilter) return false;
$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
@@ -102,9 +102,9 @@ class ValueSetObjects extends ValueSetDefinition
if (empty($this->m_sValueAttCode))
{
$this->m_aValues[$oObject->GetKey()] = $oObject->GetName();
}
else
{
}
else
{
$this->m_aValues[$oObject->GetKey()] = $oObject->GetAsHTML($this->m_sValueAttCode);
}
}