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

Pass the current object to GetEditValue

Browse Source 
SVN:trunk[1704]
This commit is contained in:
Denis Flaven
2011-12-02 16:26:23 +00:00
parent d081d1f4df
commit 02b34515f3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,7 +368,7 @@ abstract class AttributeDefinition
return array();
}
public function GetEditValue($sValue)
public function GetEditValue($sValue, $oHostObj = null)
{
return (string)$sValue;
}
@@ -1587,7 +1587,7 @@ class AttributeText extends AttributeString
return "<div $sStyle>".str_replace("\n", "<br>\n", $sValue).'</div>';
}
public function GetEditValue($sValue)
public function GetEditValue($sValue, $oHostObj = null)
{
if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
{
@@ -1692,7 +1692,7 @@ class AttributeCaseLog extends AttributeText
return $value;
}
public function GetEditClass() {return "CaseLog";}
public function GetEditValue($sValue) { return ''; } // New 'edit' value is always blank since it will be appended to the existing log
public function GetEditValue($sValue, $oHostObj = null) { return ''; } // New 'edit' value is always blank since it will be appended to the existing log
public function GetDefaultValue() {return new ormCaseLog();}
public function Equals($val1, $val2) {return ($val1->GetText() == $val2->GetText());}
@@ -2075,7 +2075,7 @@ class AttributeEnum extends AttributeString
return "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
}
public function GetEditValue($sValue)
public function GetEditValue($sValue, $oHostObj = null)
{
return $this->GetValueLabel($sValue);
}

2
core/dbobject.class.php
View File

@@ -520,7 +520,7 @@ abstract class DBObject
}
else
{
$sEditValue = $oAtt->GetEditValue($this->Get($sAttCode));
$sEditValue = $oAtt->GetEditValue($this->Get($sAttCode), $this);
}
return $sEditValue;
}