From 39a958c5a0610c7977f85937daa630e1a0e42aed Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Tue, 19 Feb 2019 14:54:48 +0100 Subject: [PATCH] =?UTF-8?q?Erste=20version=20f=C3=BCr=20Treetable=20in=20O?= =?UTF-8?q?bjectrelations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neonContext/ObjectRelation/ObjectRelation.aod | 4 ++-- .../AnyObjectRelationFilter_view.aod} | 14 ++------------ .../OrganisationMain_view.aod | 2 +- neonView/PersonMain_view/PersonMain_view.aod | 2 +- .../SalesprojectMain_view.aod | 2 +- 5 files changed, 7 insertions(+), 17 deletions(-) rename neonView/{ObjectRelationFilter_view/ObjectRelationFilter_view.aod => AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod} (76%) diff --git a/neonContext/ObjectRelation/ObjectRelation.aod b/neonContext/ObjectRelation/ObjectRelation.aod index 386580a64a6..610ecc6e44d 100644 --- a/neonContext/ObjectRelation/ObjectRelation.aod +++ b/neonContext/ObjectRelation/ObjectRelation.aod @@ -2,14 +2,14 @@ <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0"> <name>ObjectRelation</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <filterview>ObjectRelationFilter_view</filterview> + <filterview>AnyObjectRelationFilter_view</filterview> <editview>ObjectRelationEdit_view</editview> <preview>ObjectRelationPreview_view</preview> <entity>ObjectRelation_entity</entity> <references> <neonViewReference> <name>f6b27aa2-d0a7-479c-812e-8b16400b564b</name> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> <neonViewReference> <name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name> diff --git a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod similarity index 76% rename from neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod rename to neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod index 03a8e62f1ce..d104f4a2fc5 100644 --- a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod +++ b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod @@ -1,6 +1,6 @@ <?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> - <name>ObjectRelationFilter_view</name> + <name>AnyObjectRelationFilter_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <filterable v="true" /> <layout> @@ -30,18 +30,8 @@ <entityField>OBJECT2_TYPE</entityField> </neonTableColumn> <neonTableColumn> - <name>4495cf75-82d1-4ad3-9a48-86ad44eadc37</name> + <name>027a408e-56bc-4dcd-a0da-57e531954d20</name> <entityField>OBJECT2_ROWID</entityField> - <width v="75" /> - <expandRatio v="100" /> - </neonTableColumn> - <neonTableColumn> - <name>005ef2d6-114c-47e8-8db5-bb6f43a1f90a</name> - <entityField>AnyTargetType</entityField> - </neonTableColumn> - <neonTableColumn> - <name>384871e1-206e-4f48-b907-60bdda93957a</name> - <entityField>AnyTargetRowid</entityField> </neonTableColumn> </columns> </tableViewTemplate> diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod index c3792a23b39..804bbee4900 100644 --- a/neonView/OrganisationMain_view/OrganisationMain_view.aod +++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod @@ -48,7 +48,7 @@ <neonViewReference> <name>ee7395b9-b787-4662-9021-f6e2d486bd16</name> <entityField>ObjectRelations</entityField> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> </children> </neonView> diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod index 5866999b02e..5cf87beba03 100644 --- a/neonView/PersonMain_view/PersonMain_view.aod +++ b/neonView/PersonMain_view/PersonMain_view.aod @@ -32,7 +32,7 @@ <neonViewReference> <name>726f10a6-dad6-4325-a73e-2d6caf0340db</name> <entityField>ObjectRelations</entityField> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> </children> </neonView> diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod index ae2f4f219ba..22e91e68485 100644 --- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod +++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod @@ -62,7 +62,7 @@ <neonViewReference> <name>d02bf839-1901-4ca1-bcee-245ee9512fe2</name> <entityField>ObjectRelations</entityField> - <view>ObjectRelationFilter_view</view> + <view>AnyObjectRelationFilter_view</view> </neonViewReference> <neonViewReference> <name>0a3f2444-8d91-41e3-8f4d-19a6013c29c5</name> -- GitLab