diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index a5a7e59ae..9c96a3960 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -4915,11 +4915,6 @@ class AttributeEmailAddress extends AttributeString return ''.parent::GetAsHTML($sValue).''; } - public function GetRenderForDataTable(string $sClassAlias) :string - { - $sRenderFunction = "return ' '+data+'' ;"; - return $sRenderFunction; - } } /** @@ -5007,11 +5002,6 @@ class AttributePhoneNumber extends AttributeString return ''.parent::GetAsHTML($sValue).''; } - public function GetRenderForDataTable(string $sClassAlias) :string - { - $sRenderFunction = "return ' '+data+'' ;"; - return $sRenderFunction; - } } /** @@ -10340,6 +10330,7 @@ class AttributeEnumSet extends AttributeSet return $sRes; } + /** * @param ormSet $value * @param string $sSeparator diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 423106dc3..072a209f9 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -410,7 +410,7 @@ try $aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->GetKey(); } else { - $aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->Get($sAttCode); + $aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->GetAsHTML($sAttCode); } } } @@ -420,7 +420,6 @@ try } array_push($aResult["data"], $aObj); } - $oPage->add(json_encode($aResult)); $oKPI->ComputeAndReport('Data fetch and format'); break; diff --git a/sources/application/UI/Component/DataTable/DataTableFactory.php b/sources/application/UI/Component/DataTable/DataTableFactory.php index 6696e8602..e0a5edfe1 100644 --- a/sources/application/UI/Component/DataTable/DataTableFactory.php +++ b/sources/application/UI/Component/DataTable/DataTableFactory.php @@ -204,7 +204,7 @@ class DataTableFactory $aList = $aDisplayList; } - $sSelectMode = 'none'; + $sSelectMode = ''; if ($bSelectMode) { $sSelectMode = $bSingleSelectMode ? 'single' : 'multiple'; }