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

Default value for Integer attributes is now casted to int

Browse Source 
SVN:trunk[485]
This commit is contained in:
Romain Quetiez
2010-06-25 15:34:12 +00:00
parent 442161f7bd
commit 7e9529cd00
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,7 +363,7 @@ class AttributeDBFieldVoid extends AttributeDefinition
public function IsScalar() {return true;} public function IsScalar() {return true;}
public function IsWritable() {return true;} public function IsWritable() {return true;}
public function GetSQLExpr() {return $this->Get("sql");} public function GetSQLExpr() {return $this->Get("sql");}
public function GetDefaultValue() {return "";} public function GetDefaultValue() {return $this->MakeRealValue("");}
public function IsNullAllowed() {return false;} public function IsNullAllowed() {return false;}
// //
@@ -436,7 +436,7 @@ class AttributeDBField extends AttributeDBFieldVoid
{ {
return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed")); return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed"));
} }
public function GetDefaultValue() {return $this->Get("default_value");} public function GetDefaultValue() {return $this->MakeRealValue($this->Get("default_value"));}
public function IsNullAllowed() {return $this->Get("is_null_allowed");} public function IsNullAllowed() {return $this->Get("is_null_allowed");}
} }
@@ -515,11 +515,12 @@ class AttributeInteger extends AttributeDBField
public function MakeRealValue($proposedValue) public function MakeRealValue($proposedValue)
{ {
//return intval($proposedValue); could work as well //return intval($proposedValue); could work as well
if ($proposedValue == '') return null;
return (int)$proposedValue; return (int)$proposedValue;
} }
public function ScalarToSQL($value) public function ScalarToSQL($value)
{ {
assert(is_numeric($value)); assert(is_numeric($value) || is_null($value));
return $value; // supposed to be an int return $value; // supposed to be an int
} }
} }