From cca79735fcc35f79fc87bebf9b8f79510610941a Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 24 Jan 2020 16:17:26 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B0330=20-=20Attachments:=20Fix=20empty=20"?= =?UTF-8?q?Delete"=20column=20displayed=20all=20the=20time?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsfileuploadfieldrenderer.class.inc.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php index 6cf3466db..ce4bd3cec 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php +++ b/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php @@ -112,6 +112,7 @@ class BsFileUploadFieldRenderer extends BsFieldRenderer $sAttachmentTableId = $this->GetAttachmentsTableId(); $sNoAttachmentLabel = json_encode(Dict::S('Attachments:NoAttachment')); + $sDeleteColumnDef = $bIsDeleteAllowed ? '{ targets: [4], orderable: false},' : ''; $oOutput->AddJs( <<oField->GetGlobalId()} = function() "dom": "t", "order": [[3, "asc"]], "columnDefs": [ - { targets: [4], orderable: false}, - { targets: '_all', orderable: true } + $sDeleteColumnDef + { targets: '_all', orderable: true }, ], "language": { "infoEmpty": $sNoAttachmentLabel, @@ -390,7 +391,7 @@ JS } else { - $sTableHead = self::GetAttachmentTableHeader(); + $sTableHead = self::GetAttachmentTableHeader($bIsDeleteAllowed); $oOutput->Addhtml(<< $sTableHead @@ -470,6 +471,9 @@ HTML $sTitleFileSize = Dict::S('Attachments:File:Size'); $sTitleFileDate = Dict::S('Attachments:File:Date'); + // Optional column + $sDeleteHeaderAsHtml = ($bIsDeleteAllowed) ? '' : ''; + return << $sTitleThumbnail