diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php index f4acfe92c..8b155a7aa 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php @@ -717,10 +717,10 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory $aColumnDefinition["data"] = ""; $aColumnDefinition["render"]["display"] = ""; if ($sSelectMode != "single") { - $aColumnDefinition["render"]["display"] = $aColumnDefinition["render"]["display"] . " var oCheckboxElem = $('');"; + $aColumnDefinition["render"]["display"] = $aColumnDefinition["render"]["display"] . " var oCheckboxElem = $('');"; } else { - $aColumnDefinition["render"]["display"] = $aColumnDefinition["render"]["display"] . " var oCheckboxElem = $('');"; + $aColumnDefinition["render"]["display"] = $aColumnDefinition["render"]["display"] . " var oCheckboxElem = $('');"; } $aColumnDefinition["render"]["display"] = $aColumnDefinition["render"]["display"] . " if (row.limited_access) { oCheckboxElem.html('-'); } else { oCheckboxElem.find(':input').attr('data-object-id', row.id).attr('data-target-object-id', row.target_id); }"; $aColumnDefinition["render"]["display"] = $aColumnDefinition["render"]["display"]. " return oCheckboxElem.prop('outerHTML'); "; @@ -747,11 +747,6 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory 'attribute_label' => $aData['alias'], ]; $aColumnDefinition["data"] = $sClassAlias."/".$sAttCode; - if (MetaModel::IsValidAttCode($sClassName, 'obsolescence_flag')) { - $sDisplay = "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;"; - } else { - $sDisplay = "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; return displayField;"; - } $aColumnDefinition["render"] = [ "display" => "return row['".$sClassAlias."/hyperlink'];", "_" => $sClassAlias."/".$sAttCode,