From b8fea23497905fa2ff8111d680800728560b5906 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 11 Feb 2019 16:34:14 +0100
Subject: [PATCH] AttributeRelation view changes
---
.../AttributeRelation_context.aod | 9 ++-----
.../AttributeRelationFilter_view.aod} | 4 +--
.../AttributeRelationMultiEdit_view.aod | 26 -------------------
.../OrganisationMain_view.aod | 2 +-
4 files changed, 5 insertions(+), 36 deletions(-)
rename neonView/{AttributeRelationTree_view/AttributeRelationTree_view.aod => AttributeRelationFilter_view/AttributeRelationFilter_view.aod} (90%)
delete mode 100644 neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
diff --git a/neonContext/AttributeRelation_context/AttributeRelation_context.aod b/neonContext/AttributeRelation_context/AttributeRelation_context.aod
index 4604a512c94..d0ac7885be5 100644
--- a/neonContext/AttributeRelation_context/AttributeRelation_context.aod
+++ b/neonContext/AttributeRelation_context/AttributeRelation_context.aod
@@ -3,17 +3,12 @@
<name>AttributeRelation_context</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>AttributeRelationTree_view</filterview>
- <editview>AttributeRelationMultiEdit_view</editview>
+ <filterview>AttributeRelationFilter_view</filterview>
<entity>AttributeRelation_entity</entity>
<references>
<neonViewReference>
<name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>52dd8729-c22d-4767-b491-1e8c9d157ddb</name>
- <view>AttributeRelationMultiEdit_view</view>
+ <view>AttributeRelationFilter_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
similarity index 90%
rename from neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
rename to neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index df5ce99c93f..35c89979888 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_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>AttributeRelationTree_view</name>
+ <name>AttributeRelationFilter_view</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -11,7 +11,7 @@
<children>
<tableViewTemplate>
<name>Table</name>
- <autoNewRow v="false" />
+ <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
deleted file mode 100644
index e872c8b1638..00000000000
--- a/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>AttributeRelationMultiEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>GenericMultiple</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>beb3a9bd-ca81-42ce-8d43-d0984946c81e</name>
- <entityField>AB_ATTRIBUTE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>29e9bc62-c748-471e-85ae-6c87e8f2dee1</name>
- <entityField>ATTRIBUTERELATION_VALUE</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 24928bc18e0..b9ce1e2697a 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -43,7 +43,7 @@
<neonViewReference>
<name>39c98ccb-7f77-4df0-818f-1f302f69fec4</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationTree_view</view>
+ <view>AttributeRelationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>ee7395b9-b787-4662-9021-f6e2d486bd16</name>
--
GitLab