composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 17:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

CustomFields : Bootstrap integration

Browse Source 
SVN:trunk[3945]
This commit is contained in:
Guillaume Lajarige
2016-03-11 14:34:16 +00:00
parent 7ea5176b56
commit 44ba3d7bf8
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4024,15 +4024,14 @@ class AttributeExternalKey extends AttributeDBFieldVoid
$oFormField = new $sFormFieldClass($this->GetCode());
}
// Setting choices regarding the field dependencies
$aFieldDependencies = $this->GetPrerequisiteAttributes();
// Field dependencies
if (!empty($aFieldDependencies))
{
$oTmpAttDef = $this;
$oTmpField = $oFormField;
$oFormField->SetOnFinalizeCallback(function() use ($oTmpField, $oTmpAttDef, $oObject)
{
//$oTmpField = $oForm->GetField($sFieldId);
$oTmpField->SetChoices($oTmpAttDef->GetAllowedValues($oObject->ToArgsForQuery()));
});
}
@@ -4040,7 +4039,7 @@ class AttributeExternalKey extends AttributeDBFieldVoid
{
$oFormField->SetChoices($this->GetAllowedValues($oObject->ToArgsForQuery()));
}
// If ExtKey is mandatory, we add a validator to ensure that the value 0 is not selected
if ($oObject->GetAttributeFlags($this->GetCode()) & OPT_ATT_MANDATORY)
{
@@ -6561,7 +6560,7 @@ class AttributeCustomFields extends AttributeDefinition
$oFormField->SetForm($this->GetForm($oObject));
}
parent::MakeFormField($oObject, $oFormField);
return $oFormField;
}