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

N°8772 - Dashlet group by

Browse Source
This commit is contained in:
Eric Espie
2025-11-13 17:10:25 +01:00
parent 7733f13d14
commit f68082da96
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/modelreflection.class.inc.php
View File

@@ -151,7 +151,8 @@ class ModelReflectionRuntime extends ModelReflection
$aAttributes = array();
foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
{
$sAttributeClass = get_class($oAttDef);
$oReflection = new ReflectionClass($oAttDef);
$sAttributeClass = $oReflection->getShortName();
if ($aScope != null)
{
foreach ($aScope as $sScopeClass)

3
sources/Forms/Block/DataModel/OqlFormBlock.php
View File

@@ -10,7 +10,6 @@ use Combodo\iTop\Forms\Block\Base\TextAreaFormBlock;
use Combodo\iTop\Forms\Block\FormType\OqlFormType;
use Combodo\iTop\Forms\Block\IO\Converter\OqlToClassConverter;
use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\Block\IO\Format\StringIOFormat;
/**
* Form block for oql expression.
@@ -21,7 +20,6 @@ class OqlFormBlock extends TextAreaFormBlock
{
// outputs
public const OUTPUT_SELECTED_CLASS = 'selected_class';
public const OUTPUT_OQL = 'oql';
/** @inheritdoc */
public function GetFormType(): string
@@ -34,7 +32,6 @@ class OqlFormBlock extends TextAreaFormBlock
{
parent::InitOutputs();
$this->AddOutput(self::OUTPUT_SELECTED_CLASS, ClassIOFormat::class, new OqlToClassConverter());
$this->AddOutput(self::OUTPUT_OQL, StringIOFormat::class);
}
/** @inheritdoc */