diff --git a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php
index 4a5ddd102..6ad3cb7e2 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php
@@ -143,7 +143,7 @@ var buildTable_{$this->oField->GetGlobalId()} = function()
"dom": "t",
"order": [[3, "asc"]],
"columnDefs": [
- { targets: [5], orderable: false},
+ { targets: [4], orderable: false},
{ targets: '_all', orderable: true }
],
"language": {
@@ -389,22 +389,10 @@ JS
}
else
{
- $sTitleThumbnail = Dict::S('Attachments:File:Thumbnail');
- $sTitleFileName = Dict::S('Attachments:File:Name');
- $sTitleFileSize = Dict::S('Attachments:File:Size');
- $sTitleFileDate = Dict::S('Attachments:File:Date');
- $sTitleFileCreator = Dict::S('Attachments:File:Creator');
- $sTitleFileType = Dict::S('Attachments:File:MimeType');
+ $sTableHead = self::GetAttachmentTableHeader();
$oOutput->Addhtml(<<
-
- | $sTitleThumbnail |
- $sTitleFileName |
- $sTitleFileSize |
- $sTitleFileDate |
- $sTitleFileCreator |
- |
-
+ $sTableHead
HTML
);
@@ -456,7 +444,6 @@ HTML
$sAttachmentMeta,
$sFileSize,
$sAttachmentDate,
- $sAttachmentCreator,
$bIsDeleteAllowed
));
}
@@ -469,24 +456,41 @@ HTML
}
}
+ protected static function GetAttachmentTableHeader()
+ {
+ $sTitleThumbnail = Dict::S('Attachments:File:Thumbnail');
+ $sTitleFileName = Dict::S('Attachments:File:Name');
+ $sTitleFileSize = Dict::S('Attachments:File:Size');
+ $sTitleFileDate = Dict::S('Attachments:File:Date');
+
+ return <<
+ $sTitleThumbnail |
+ $sTitleFileName |
+ $sTitleFileSize |
+ $sTitleFileDate |
+ |
+
+HTML;
+ }
+
/**
- * @param $iAttId
- * @param $sLineStyle
- * @param $sDocDownloadUrl
- * @param $sIconClass
- * @param $sAttachmentThumbUrl
- * @param $sFileName
- * @param $sAttachmentMeta
- * @param $sFileSize
- * @param $sAttachmentDate
- * @param $sAttachmentCreator
- * @param $bIsDeleteAllowed
+ * @param int $iAttId
+ * @param string $sLineStyle
+ * @param string $sDocDownloadUrl
+ * @param string $sIconClass
+ * @param string $sAttachmentThumbUrl
+ * @param string $sFileName
+ * @param string $sAttachmentMeta
+ * @param string $sFileSize
+ * @param string $sAttachmentDate
+ * @param boolean $bIsDeleteAllowed
*
* @return string
*/
protected static function GetAttachmentTableRow(
$iAttId, $sLineStyle, $sDocDownloadUrl, $sIconClass, $sAttachmentThumbUrl, $sFileName, $sAttachmentMeta, $sFileSize,
- $sAttachmentDate, $sAttachmentCreator, $bIsDeleteAllowed
+ $sAttachmentDate, $bIsDeleteAllowed
) {
$sDeleteButton = '';
if ($bIsDeleteAllowed)
@@ -501,7 +505,6 @@ HTML
$sFileName$sAttachmentMeta |
$sFileSize |
$sAttachmentDate |
- $sAttachmentCreator |
$sDeleteButton |
HTML;