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

N°8772 - cleanup code

Browse Source
This commit is contained in:
Eric Espie
2025-10-30 14:24:09 +01:00
parent 601cde0e2d
commit 0df54413b3
23 changed files with 183 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php
View File

@@ -8,10 +8,9 @@ namespace Combodo\iTop\Forms\Block\DataModel;
use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
use Combodo\iTop\Forms\Block\FormBlockException;
use Combodo\iTop\Forms\Block\IO\Converter\StringToAttributeConverter;
use Combodo\iTop\Forms\Block\IO\Format\AttributeIOFormat;
use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\Block\IO\Converter\StringToAttributeConverter;
use Combodo\iTop\Forms\FormType\AttributeFormType;
use CoreException;
use MetaModel;
@@ -28,22 +27,23 @@ class AttributeChoiceFormBlock extends ChoiceFormBlock
// outputs
public const OUTPUT_ATTRIBUTE = 'attribute';
/** @inheritdoc */
/** @inheritdoc */
public function InitOptions(): array
{
$aOptions = parent::InitOptions();
// $aOptions['placeholder'] = 'Select an attribute...';
return $aOptions;
}
/** @inheritdoc */
/** @inheritdoc */
public function InitInputs(): void
{
parent::InitInputs();
$this->AddInput(self::INPUT_CLASS_NAME, ClassIOFormat::class);
}
/** @inheritdoc */
/** @inheritdoc */
public function InitOutputs(): void
{
parent::InitOutputs();
@@ -67,11 +67,12 @@ class AttributeChoiceFormBlock extends ChoiceFormBlock
$aOptions = parent::GetOptions();
$oValue = $this->GetInput(self::INPUT_CLASS_NAME)->Value();
if($oValue == '')
if ($oValue == '') {
return $aOptions;
}
$aAttributeCodes = MetaModel::GetAttributesList($oValue);
$aAttributeCodes = array_combine($aAttributeCodes, $aAttributeCodes) ;
$aAttributeCodes = array_combine($aAttributeCodes, $aAttributeCodes);
$aOptions['choices'] = $aAttributeCodes;
return $aOptions;

28
sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php
View File

@@ -11,7 +11,6 @@ use Combodo\iTop\Forms\Block\FormBlockException;
use Combodo\iTop\Forms\Block\IO\Format\AttributeIOFormat;
use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\Block\IO\Format\RawFormat;
use Combodo\iTop\Forms\FormType\AttributeValueFormType;
use Exception;
use MetaModel;
@@ -27,21 +26,21 @@ class AttributeValueChoiceFormBlock extends ChoiceFormBlock
public const INPUT_ATTRIBUTE = 'attribute';
// Outputs
public const OUTPUT_VALUE = 'value';
public const OUTPUT_VALUE = 'value';
/** @inheritdoc */
/** @inheritdoc */
public function InitOptions(array &$aOptions = []): array
{
$aOptions['multiple'] = true;
$aOptions['attr'] = [
'size' => 5,
'style' => 'height: auto;'
'size' => 5,
'style' => 'height: auto;',
];
return $aOptions;
}
/** @inheritdoc */
/** @inheritdoc */
public function InitInputs(): void
{
parent::InitInputs();
@@ -49,7 +48,7 @@ class AttributeValueChoiceFormBlock extends ChoiceFormBlock
$this->AddInput(self::INPUT_ATTRIBUTE, AttributeIOFormat::class);
}
/** @inheritdoc */
/** @inheritdoc */
public function InitOutputs(): void
{
parent::InitOutputs();
@@ -64,12 +63,12 @@ class AttributeValueChoiceFormBlock extends ChoiceFormBlock
{
$bDependentOk = $this->GetInput(self::INPUT_CLASS_NAME)->Value() != '' && $this->GetInput(self::INPUT_ATTRIBUTE)->Value() != '';
if($bDependentOk) {
if ($bDependentOk) {
$oAttDef = MetaModel::GetAttributeDef($this->GetInput(self::INPUT_CLASS_NAME)->Value()->__toString(), $this->GetInput(self::INPUT_ATTRIBUTE)->Value()->__toString());
$aValues = $oAttDef->GetAllowedValues();
return $aValues != null;
}
else{
} else {
return false;
}
}
@@ -82,18 +81,21 @@ class AttributeValueChoiceFormBlock extends ChoiceFormBlock
$aOptions = parent::GetOptions();
$oClassName = $this->GetInput(self::INPUT_CLASS_NAME)->Value();
if($oClassName == '')
if ($oClassName == '') {
return $aOptions;
}
$oAttribute = $this->GetInput(self::INPUT_ATTRIBUTE)->Value();
if($oAttribute == '')
if ($oAttribute == '') {
return $aOptions;
}
$oAttDef = MetaModel::GetAttributeDef(strval($oClassName), strval($oAttribute));
$aValues = $oAttDef->GetAllowedValues();
if($aValues === null)
if ($aValues === null) {
return $aOptions;
}
$aOptions['choices'] = array_flip($aValues ?? []);

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

@@ -7,9 +7,9 @@
namespace Combodo\iTop\Forms\Block\DataModel;
use Combodo\iTop\Forms\Block\Base\TextAreaFormBlock;
use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\Block\IO\Converter\OqlToClassConverter;
use Combodo\iTop\Forms\Block\FormType\OqlFormType;
use Combodo\iTop\Forms\Block\IO\Converter\OqlToClassConverter;
use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
/**
* Form block for oql expression.
@@ -21,27 +21,27 @@ class OqlFormBlock extends TextAreaFormBlock
// outputs
public const OUTPUT_SELECTED_CLASS = 'selected_class';
/** @inheritdoc */
/** @inheritdoc */
public function GetFormType(): string
{
return OqlFormType::class;
}
/** @inheritdoc */
/** @inheritdoc */
public function InitOutputs(): void
{
parent::InitOutputs();
$this->AddOutput(self::OUTPUT_SELECTED_CLASS, ClassIOFormat::class, new OqlToClassConverter());
}
/** @inheritdoc */
/** @inheritdoc */
public function InitOptions(): array
{
$aOptions = parent::InitOptions();
$aOptions['with_ai_button'] = true;
return $aOptions;
}
}