composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 06:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6042 Field init : use existing method in AttDef

Browse Source 
Thanks Molkobain for the review in 0c70bd9
This commit is contained in:
Pierre Goiffon
2023-03-31 11:19:11 +02:00
parent 7fa06832b2
commit 82ddc64e44
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/cmdbabstract.class.inc.php
View File

@@ -2011,7 +2011,7 @@ HTML
* @param string $iId
* @param string $sNameSuffix
* @param int $iFlags
* @param array $aArgs
* @param array{this: \DBObject, formPrefix: string} $aArgs
* @param bool $bPreserveCurrentValue Preserve the current value even if not allowed
* @param string $sInputType type of rendering used, see ENUM_INPUT_TYPE_* const
*
@@ -2028,6 +2028,7 @@ HTML
* @throws \Twig\Error\LoaderError
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
* @throws \Exception
*/
public static function GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $value = '', $sDisplayValue = '', $iId = '', $sNameSuffix = '', $iFlags = 0, $aArgs = array(), $bPreserveCurrentValue = true, &$sInputType = '')
{
@@ -2513,10 +2514,15 @@ HTML;
}
$oForm = new Combodo\iTop\Form\Form($sFormId);
/** @var \Combodo\iTop\Form\Field\Field $sFormFieldClass */
// creating manually the field, as we need a specific id for the JS to work (send data back to the server)
$sFormFieldClass = $oAttDef::GetFormFieldClass();
$oAttDefField = new $sFormFieldClass($sAttCode.'_field');
$oAttDefField->SetCurrentValue($value); // value transformation might be delegated in a custom FieldRenderer
$oAttDef->MakeFormField($aArgs['this'], $oAttDefField);
// Remove label generated in MakeFormField : the current method should return the field only, as the label is already generated in the caller GetBareProperties()
$oAttDefField->SetLabel('');
$oForm->AddField($oAttDefField);
}

47
core/attributedef.class.inc.php
View File

@@ -1074,17 +1074,20 @@ abstract class AttributeDefinition
* $oFormField is passed, MakeFormField behave more like a Prepare.
*
* @param \DBObject $oObject
* @param \Combodo\iTop\Form\Field\Field $oFormField
* @param \Combodo\iTop\Form\Field\Field|null $oFormField
*
* @return null
* @return \Combodo\iTop\Form\Field\Field
* @throws \CoreException
* @throws \Exception
*
* @noinspection PhpMissingReturnTypeInspection
* @noinspection PhpMissingParamTypeInspection
* @noinspection ReturnTypeCanBeDeclaredInspection
*/
public function MakeFormField(DBObject $oObject, $oFormField = null)
{
// This is a fallback in case the AttributeDefinition subclass has no overloading of this function.
if ($oFormField === null)
{
if ($oFormField === null) {
$sFormFieldClass = static::GetFormFieldClass();
$oFormField = new $sFormFieldClass($this->GetCode());
//$oFormField->SetReadOnly(true);
@@ -1094,22 +1097,17 @@ abstract class AttributeDefinition
// Attributes flags
// - Retrieving flags for the current object
if ($oObject->IsNew())
{
if ($oObject->IsNew()) {
$iFlags = $oObject->GetInitialStateAttributeFlags($this->GetCode());
}
else
{
} else {
$iFlags = $oObject->GetAttributeFlags($this->GetCode());
}
// - Comparing flags
if ($this->IsWritable() && (!$this->IsNullAllowed() || (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY)))
{
if ($this->IsWritable() && (!$this->IsNullAllowed() || (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY))) {
$oFormField->SetMandatory(true);
}
if ((!$oObject->IsNew() || !$oFormField->GetMandatory()) && (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY))
{
if ((!$oObject->IsNew() || !$oFormField->GetMandatory()) && (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY)) {
$oFormField->SetReadOnly(true);
}
@@ -1117,15 +1115,13 @@ abstract class AttributeDefinition
$oFormField->SetCurrentValue($oObject->Get($this->GetCode()));
// Validation pattern
if ($this->GetValidationPattern() !== '')
{
if ($this->GetValidationPattern() !== '') {
$oFormField->AddValidator(new Validator($this->GetValidationPattern()));
}
// Description
$sAttDescription = $this->GetDescription();
if(!empty($sAttDescription))
{
if (!empty($sAttDescription)) {
$oFormField->SetDescription($this->GetDescription());
}
@@ -1135,11 +1131,9 @@ abstract class AttributeDefinition
$oFormField->AddMetadata('attribute-label', $this->GetLabel());
// - Attribute flags
$aPossibleAttFlags = MetaModel::EnumPossibleAttributeFlags();
foreach($aPossibleAttFlags as $sFlagCode => $iFlagValue)
{
foreach ($aPossibleAttFlags as $sFlagCode => $iFlagValue) {
// Note: Skip normal flag as we don't need it.
if($sFlagCode === 'normal')
{
if ($sFlagCode === 'normal') {
continue;
}
$sFormattedFlagCode = str_ireplace('_', '-', $sFlagCode);
@@ -1147,9 +1141,8 @@ abstract class AttributeDefinition
$oFormField->AddMetadata('attribute-flag-'.$sFormattedFlagCode, $sFormattedFlagValue);
}
// - Value raw
if ($this::IsScalar())
{
$oFormField->AddMetadata('value-raw', (string) $oObject->Get($this->GetCode()));
if ($this::IsScalar()) {
$oFormField->AddMetadata('value-raw', (string)$oObject->Get($this->GetCode()));
}
return $oFormField;
@@ -1161,10 +1154,10 @@ abstract class AttributeDefinition
public function EnumTemplateVerbs()
{
return array(
'' => 'Plain text (unlocalized) representation',
'html' => 'HTML representation',
'' => 'Plain text (unlocalized) representation',
'html' => 'HTML representation',
'label' => 'Localized representation',
'text' => 'Plain text representation (without any markup)',
'text' => 'Plain text representation (without any markup)',
);
}