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

Log warning when integer is set to invalid value

Browse Source
This commit is contained in:
XavierGR
2025-04-18 11:16:52 +02:00
parent 5ba44a03ea
commit 24b2852830
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2735,7 +2735,7 @@ class AttributeDBFieldVoid extends AttributeDefinition
public function GetPrerequisiteAttributes($sClass = null) public function GetPrerequisiteAttributes($sClass = null)
{ {
$aPrerequisiteAttributes = $this->Get("depends_on"); $aPrerequisiteAttributes = $this->Get("depends_on");
if($this->HasParam('expression')) { if($this->IsComputed()) {
$aPrerequisiteAttributes = array_merge($aPrerequisiteAttributes, $this->GetComputedPrerequisiteAttributes()); $aPrerequisiteAttributes = array_merge($aPrerequisiteAttributes, $this->GetComputedPrerequisiteAttributes());
} }
return $aPrerequisiteAttributes; return $aPrerequisiteAttributes;
@@ -2983,14 +2983,12 @@ class AttributeInteger extends AttributeDBField
public function MakeRealValue($proposedValue, $oHostObj) public function MakeRealValue($proposedValue, $oHostObj)
{ {
if (is_null($proposedValue)) if (is_null($proposedValue) || $proposedValue === '')
{ {
return null; return null;
} elseif(gettype($proposedValue) !== 'integer') {
IssueLog::Warning("Trying to set integer attribute ".$this->GetCode()." to type".gettype($proposedValue)".");
} }
if ($proposedValue === '')
{
return null;
} // 0 is transformed into '' !
return (int)$proposedValue; return (int)$proposedValue;
} }

11
core/dbobject.class.php
View File

@@ -706,10 +706,10 @@ abstract class DBObject implements iDisplay
} }
$this->_Set($sAttCode, $realvalue); $this->_Set($sAttCode, $realvalue);
$this->UpdateMetaAttributes(array($sAttCode));
$this->UpdateDependentComputedAttributes($sAttCode); $this->UpdateDependentComputedAttributes($sAttCode);
$this->UpdateMetaAttributes(array($sAttCode));
// The object has changed, reset caches // The object has changed, reset caches
$this->m_bCheckStatus = null; $this->m_bCheckStatus = null;
@@ -7001,6 +7001,7 @@ abstract class DBObject implements iDisplay
* @return void * @return void
* @throws CoreException * @throws CoreException
* @throws OQLException * @throws OQLException
* @throws Exception
*/ */
private function UpdateDependentComputedAttributes(string $sAttCode): void private function UpdateDependentComputedAttributes(string $sAttCode): void
{ {
@@ -7008,7 +7009,11 @@ abstract class DBObject implements iDisplay
$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sCode); $oAttDef = MetaModel::GetAttributeDef(get_class($this), $sCode);
if ($oAttDef->IsComputed()) { if ($oAttDef->IsComputed()) {
$oExpression = Expression::FromOQL($oAttDef->GetParams()['expression']); $oExpression = Expression::FromOQL($oAttDef->GetParams()['expression']);
$this->_Set($sCode, $this->EvaluateExpression($oExpression)); $value = $this->EvaluateExpression($oExpression);
$aAllowedValues = $oAttDef->GetAllowedValues();
if(is_null($aAllowedValues) || in_array($value, $aAllowedValues)) {
$this->_Set($sCode, $oAttDef->MakeRealValue($value, $this));
} ;
} }
} }
} }

1
core/metamodel.class.php
View File

@@ -2661,6 +2661,7 @@ abstract class MetaModel
*/ */
public static function GetAttributeFlags($sClass, $sState, $sAttCode) public static function GetAttributeFlags($sClass, $sState, $sAttCode)
{ {
$iFlags = 0;
if (self::HasLifecycle($sClass)) { if (self::HasLifecycle($sClass)) {
$aStates = MetaModel::EnumStates($sClass); $aStates = MetaModel::EnumStates($sClass);
if (!array_key_exists($sState, $aStates)) { if (!array_key_exists($sState, $aStates)) {