From 27ee6fec700aa5ce56d6f0a82a1156392a3a77e7 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Thu, 18 Feb 2021 14:49:28 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B03634=20-=20Feedback=20alpha=203.0=20:=20?=
 =?UTF-8?q?finish=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Component/DataTable/DataTableUIBlockFactory.php  | 12 +++++++++---
 .../base/components/datatable/layout.ready.js.twig   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
index ac40a347d..4bbbf8060 100644
--- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
+++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
@@ -309,15 +309,21 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 				if ($aData['checked']) {
 					if ($sAttCode == '_key_') {
 						if ($bViewLink) {
+							if (MetaModel::IsValidAttCode($sClassName, 'obsolescence_flag')) {
+								$sDisplayFunction = "let displayField = '<span class=\"object-ref\" title=\"".$sClassAlias."::'+data+'\"><a class=\'object-ref-link\' href=\'UI.php?operation=details&class=".$sClassName."&id='+data+'\'>'+row['".$sClassAlias."/friendlyname']+'</a></span>';  if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = '<span class=\"object-ref obsolete\" title=\"obsolete\"><a class=\'object-ref-link\' href=\'UI.php?operation=details&class=".$sClassName."&id='+data+'\'><span class=\"object-ref-icon fas fa-eye-slash object-obsolete fa-1x fa-fw\"></span>'+row['".$sClassAlias."/friendlyname']+'</a></span>';} return displayField;";
+							} else {
+								$sDisplayFunction = "let displayField = '<span class=\"object-ref\" title=\"".$sClassAlias."::'+data+'\"><a class=\'object-ref-link\' href=\'UI.php?operation=details&class=".$sClassName."&id='+data+'\'>'+row['".$sClassAlias."/friendlyname']+'</a></span>'; return displayField;";
+							}
 							$aColumnDefinition[] = [
 								'description' => $aData['label'],
 								'object_class' => $sClassName,
 								'class_alias' => $sClassAlias,
 								'attribute_code' => $sAttCode,
 								'attribute_type' => '_key_',
-								'attribute_label' => $aData['alias'],
-								"render" => "let displayField = '<span class=\"object-ref\" title=\"".$sClassAlias."::'+data+'\"><a class=\'object-ref-link\' href=\'UI.php?operation=details&class=".$sClassName."&id='+data+'\'>'+row['".$sClassAlias."/friendlyname']+'</a></span>';  if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = '<span class=\"object-ref obsolete\" title=\"obsolete\"><a class=\'object-ref-link\' href=\'UI.php?operation=details&class=".$sClassName."&id='+data+'\'><span class=\"object-ref-icon fas fa-eye-slash object-obsolete fa-1x fa-fw\"></span>'+row['".$sClassAlias."/friendlyname']+'</a></span>';} return displayField;",
+								'attribute_label' => Dict::S('Class:'.$sClassName),
+								'render' => $sDisplayFunction,
 							];
+
 						}
 					} else {
 						$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
@@ -330,7 +336,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 							'attribute_code' => $sAttCode,
 							'attribute_type' => $sAttDefClass,
 							'attribute_label' => $sAttLabel,
-							"render" => $oAttDef->GetRenderForDataTable($sClassAlias),
+							'render' => $oAttDef->GetRenderForDataTable($sClassAlias),
 						];
 					}
 					$iIndexColumn++;
diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig
index a786e52d4..989f5d753 100644
--- a/templates/base/components/datatable/layout.ready.js.twig
+++ b/templates/base/components/datatable/layout.ready.js.twig
@@ -46,7 +46,7 @@ else
 {
     maxHeight{{ sListId }} = maxHeight{{ sListId }} -50;
 }
-console.warn(maxHeight{{ sListId }});
+
 var oTable{{ sListId }} = $('#{{ oUIBlock.GetId() }}').DataTable({
     language: {
         processing: "{{ 'UI:Datatables:Language:Processing'|dict_s }}",