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 @@ ...@@ -265,6 +265,11 @@
</entityActionField> </entityActionField>
</children> </children>
</entityActionGroup> </entityActionGroup>
<entityField>
<name>NAME_LINKED</name>
<title>Filename</title>
<contentType>LINK</contentType>
</entityField>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<jDitoRecordContainer> <jDitoRecordContainer>
...@@ -281,6 +286,12 @@ ...@@ -281,6 +286,12 @@
<jDitoRecordFieldMapping> <jDitoRecordFieldMapping>
<name>NAME.value</name> <name>NAME.value</name>
</jDitoRecordFieldMapping> </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>NAME_LINKED.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>NAME_LINKED.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping> <jDitoRecordFieldMapping>
<name>SIZE.value</name> <name>SIZE.value</name>
</jDitoRecordFieldMapping> </jDitoRecordFieldMapping>
......
...@@ -28,7 +28,8 @@ if(vars.exists("$param.AssignmentTable_param") && ...@@ -28,7 +28,8 @@ if(vars.exists("$param.AssignmentTable_param") &&
for( var i = 0; i < metadata.length; i++) for( var i = 0; i < metadata.length; i++)
{ {
var previewAvatar = metadata[i].preview || "VAADIN:FILE"; 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].edit, previewAvatar, metadata[i].mimetype,
metadata[i].description, metadata[i].keyword, assignmentRowId]); metadata[i].description, metadata[i].keyword, assignmentRowId]);
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<tilesViewTemplate> <tilesViewTemplate>
<name>Tiles</name> <name>Tiles</name>
<iconField>PREVIEW_IMAGE</iconField> <iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField> <titleField>NAME_LINKED</titleField>
<subtitleField>TYPE</subtitleField> <subtitleField>TYPE</subtitleField>
<descriptionField>SIZE</descriptionField> <descriptionField>SIZE</descriptionField>
<infoTopField>IS_MAIN_DOCUMENT</infoTopField> <infoTopField>IS_MAIN_DOCUMENT</infoTopField>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<tableViewTemplate> <tableViewTemplate>
<name>Documents</name> <name>Documents</name>
<iconField>PREVIEW_IMAGE</iconField> <iconField>PREVIEW_IMAGE</iconField>
<titleField>NAME</titleField> <titleField>NAME_LINKED</titleField>
<subtitleField>TYPE</subtitleField> <subtitleField>TYPE</subtitleField>
<descriptionField>SIZE</descriptionField> <descriptionField>SIZE</descriptionField>
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<columns> <columns>
<neonTableColumn> <neonTableColumn>
<name>1ecb7858-44ab-42de-abb8-d8c74afa30d0</name> <name>1ecb7858-44ab-42de-abb8-d8c74afa30d0</name>
<entityField>NAME</entityField> <entityField>NAME_LINKED</entityField>
</neonTableColumn> </neonTableColumn>
<neonTableColumn> <neonTableColumn>
<name>455a5afa-82f0-42d0-aba4-46ff1196234f</name> <name>455a5afa-82f0-42d0-aba4-46ff1196234f</name>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<columns> <columns>
<neonTreeTableColumn> <neonTreeTableColumn>
<name>e9438bff-d061-4fff-bcf8-2995cdb636bd</name> <name>e9438bff-d061-4fff-bcf8-2995cdb636bd</name>
<entityField>NAME</entityField> <entityField>NAME_LINKED</entityField>
</neonTreeTableColumn> </neonTreeTableColumn>
<neonTreeTableColumn> <neonTreeTableColumn>
<name>2db45402-1cc7-49bd-b083-7baa8a5a97fc</name> <name>2db45402-1cc7-49bd-b083-7baa8a5a97fc</name>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<children> <children>
<actionListViewTemplate> <actionListViewTemplate>
<name>Actions</name> <name>Actions</name>
<titleField>NAME</titleField> <titleField>NAME_LINKED</titleField>
<descriptionField>DESCRIPTION</descriptionField> <descriptionField>DESCRIPTION</descriptionField>
<iconField>ICON</iconField> <iconField>ICON</iconField>
<entryAction>downloadSingleFileAction</entryAction> <entryAction>downloadSingleFileAction</entryAction>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</neonTableColumn> </neonTableColumn>
<neonTableColumn> <neonTableColumn>
<name>9138d75e-c7d1-4b49-8fd3-c67ef53d0e8b</name> <name>9138d75e-c7d1-4b49-8fd3-c67ef53d0e8b</name>
<entityField>NAME</entityField> <entityField>NAME_LINKED</entityField>
</neonTableColumn> </neonTableColumn>
<neonTableColumn> <neonTableColumn>
<name>3c8d2e5e-9db9-4a76-844e-85e84ea73078</name> <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