Skip to content
Snippets Groups Projects
Commit 6c5c971f authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '1062070_document_mimetype' into '2021.1'

1062070+1063550 (Links in der Dokumappe, bessere Typen)

See merge request xrm/basic!1181
parents 3a333d0b a45d4a8a
No related branches found
No related tags found
No related merge requests found
......@@ -265,6 +265,11 @@
</entityActionField>
</children>
</entityActionGroup>
<entityField>
<name>NAME_LINKED</name>
<title>Filename</title>
<contentType>LINK</contentType>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......@@ -281,6 +286,12 @@
<jDitoRecordFieldMapping>
<name>NAME.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>NAME_LINKED.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>NAME_LINKED.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>SIZE.value</name>
</jDitoRecordFieldMapping>
......
......@@ -28,7 +28,8 @@ if(vars.exists("$param.AssignmentTable_param") &&
for( var i = 0; i < metadata.length; i++)
{
var previewAvatar = metadata[i].preview || "VAADIN:FILE";
documents.push( [metadata[i].id, metadata[i].filename, metadata[i].size,
var link = "/client/binary?no-cache=true&id=" + metadata[i].id;
documents.push( [metadata[i].id, metadata[i].filename, link, metadata[i].filename, metadata[i].size,
metadata[i].edit, previewAvatar, metadata[i].mimetype,
metadata[i].description, metadata[i].keyword, assignmentRowId]);
}
......
......@@ -12,7 +12,7 @@
<tilesViewTemplate>
<name>Tiles</name>
<iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField>
<titleField>NAME_LINKED</titleField>
<subtitleField>TYPE</subtitleField>
<descriptionField>SIZE</descriptionField>
<infoTopField>IS_MAIN_DOCUMENT</infoTopField>
......@@ -24,7 +24,7 @@
<tableViewTemplate>
<name>Documents</name>
<iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField>
<titleField>NAME_LINKED</titleField>
<subtitleField>TYPE</subtitleField>
<descriptionField>SIZE</descriptionField>
<entityField>#ENTITY</entityField>
......@@ -33,7 +33,7 @@
<columns>
<neonTableColumn>
<name>1ecb7858-44ab-42de-abb8-d8c74afa30d0</name>
<entityField>NAME</entityField>
<entityField>NAME_LINKED</entityField>
</neonTableColumn>
<neonTableColumn>
<name>455a5afa-82f0-42d0-aba4-46ff1196234f</name>
......@@ -60,7 +60,7 @@
<columns>
<neonTreeTableColumn>
<name>e9438bff-d061-4fff-bcf8-2995cdb636bd</name>
<entityField>NAME</entityField>
<entityField>NAME_LINKED</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>2db45402-1cc7-49bd-b083-7baa8a5a97fc</name>
......
......@@ -12,7 +12,7 @@
<children>
<actionListViewTemplate>
<name>Actions</name>
<titleField>NAME</titleField>
<titleField>NAME_LINKED</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>ICON</iconField>
<entryAction>downloadSingleFileAction</entryAction>
......
......@@ -23,7 +23,7 @@
</neonTableColumn>
<neonTableColumn>
<name>9138d75e-c7d1-4b49-8fd3-c67ef53d0e8b</name>
<entityField>NAME</entityField>
<entityField>NAME_LINKED</entityField>
</neonTableColumn>
<neonTableColumn>
<name>3c8d2e5e-9db9-4a76-844e-85e84ea73078</name>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment