From 6dac763a7019cd40386cd6ebe5fc11baa6b824d0 Mon Sep 17 00:00:00 2001 From: Benjamin Ulrich <b.ulrich@adito.de> Date: Tue, 19 May 2020 09:30:49 +0000 Subject: [PATCH] 1056568 activity store documents at creation --- entity/Activity_entity/Activity_entity.aod | 1 + neonContext/Document/Document.aod | 4 +++ .../ActivityEdit_view/ActivityEdit_view.aod | 9 ++--- .../DocumentMultipleEdit_view.aod | 34 +++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod index ff9b680764..b5ebf375b2 100644 --- a/entity/Activity_entity/Activity_entity.aod +++ b/entity/Activity_entity/Activity_entity.aod @@ -565,6 +565,7 @@ </entityField> <entityField> <name>bindata</name> + <title>data</title> <contentType>FILE</contentType> <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/bindata/stateProcess.js</stateProcess> <onValueChange>%aditoprj%/entity/Activity_entity/entityfields/bindata/onValueChange.js</onValueChange> diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod index 7c1ab4ead5..23df7610e8 100644 --- a/neonContext/Document/Document.aod +++ b/neonContext/Document/Document.aod @@ -29,5 +29,9 @@ <name>16c5b82f-8690-493c-98d9-150c086202d0</name> <view>DocumentDrawer_view</view> </neonViewReference> + <neonViewReference> + <name>cd17be33-73ae-4e8d-a852-65152a772926</name> + <view>DocumentMultipleEdit_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod index 4f90018a99..43d67ddddc 100644 --- a/neonView/ActivityEdit_view/ActivityEdit_view.aod +++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod @@ -20,10 +20,6 @@ <name>290c8b73-4078-47eb-8009-a011f0ae670c</name> <entityField>SUBJECT</entityField> </entityFieldLink> - <entityFieldLink> - <name>4a15411b-5bd7-45c5-bd6d-7cde461b12d9</name> - <entityField>bindata</entityField> - </entityFieldLink> <entityFieldLink> <name>b90a5d96-9d1f-4eeb-b42c-0debeb7cf260</name> <entityField>INFO</entityField> @@ -56,5 +52,10 @@ <entityField>Attributes</entityField> <view>AttributeRelationMultiEdit_view</view> </neonViewReference> + <neonViewReference> + <name>1dfe4fcc-eb36-4a6c-878d-f907d36de9ac</name> + <entityField>Documents</entityField> + <view>DocumentMultipleEdit_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod b/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod new file mode 100644 index 0000000000..26aa81b5f3 --- /dev/null +++ b/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> + <name>DocumentMultipleEdit_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <noneLayout> + <name>layout</name> + </noneLayout> + </layout> + <children> + <genericMultipleViewTemplate> + <name>genericMultiple</name> + <entityField>#ENTITY</entityField> + <columns> + <neonGenericMultipleTableColumn> + <name>c4cc3dbf-95cb-4947-ae8a-4c8cca9f21b0</name> + <entityField>BINDATA_UPLOAD</entityField> + </neonGenericMultipleTableColumn> + <neonGenericMultipleTableColumn> + <name>40bf8a61-711f-42b8-b24c-0cdfc92e579f</name> + <entityField>NAME</entityField> + </neonGenericMultipleTableColumn> + <neonGenericMultipleTableColumn> + <name>dc1d0e99-6600-4067-8192-07e8c605d362</name> + <entityField>DESCRIPTION</entityField> + </neonGenericMultipleTableColumn> + <neonGenericMultipleTableColumn> + <name>ab509c66-f72a-46b5-af5d-2b5620506bf5</name> + <entityField>IS_MAIN_DOCUMENT</entityField> + </neonGenericMultipleTableColumn> + </columns> + </genericMultipleViewTemplate> + </children> +</neonView> -- GitLab