From 3f1228f52ebc9b9ee2f3a99bd32d282b78260b4e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 16 May 2019 09:40:25 +0200
Subject: [PATCH] Classification fixes
---
.../ClassificationAdmin_entity.aod | 2 +-
.../ClassificationAdmin/ClassificationAdmin.aod | 1 -
.../ClassificatonEdit_view/ClassificatonEdit_view.aod | 2 ++
.../SalesprojectMain_view/SalesprojectMain_view.aod | 10 +++++-----
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index c858b4d1967..96ef4534e9a 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -2,7 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<name>ClassificationAdmin_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:TRENDING_UP</icon>
+ <icon>VAADIN:LIST_OL</icon>
<title>Classification</title>
<titlePlural>Classifications</titlePlural>
<recordContainer>jdito</recordContainer>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index 7c257e5c23a..39b6239be46 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -2,7 +2,6 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>ClassificationAdmin</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:ABACUS</icon>
<mainview>ClassificationAdminMain_view</mainview>
<filterview>ClassificationAdminFilter_view</filterview>
<entity>ClassificationAdmin_entity</entity>
diff --git a/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod b/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
index b8689e13351..3a9b326512d 100644
--- a/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
+++ b/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
@@ -6,6 +6,8 @@
<layout>
<boxLayout>
<name>layout</name>
+ <direction>VERTICAL</direction>
+ <maxDirectionElements v="1" />
</boxLayout>
</layout>
<children>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 5b41f9deab2..ced09a2fdf6 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -24,6 +24,11 @@
<entityField>Tasks</entityField>
<view>TaskFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>2a26811c-de47-442a-97d2-adc90a6c99ae</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>9dbe03b3-e5d3-4db8-b542-506b13322d4f</name>
<entityField>SalesprojectForecasts</entityField>
@@ -74,10 +79,5 @@
<entityField>LogHistoryConsumer</entityField>
<view>LogHistoryFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>2a26811c-de47-442a-97d2-adc90a6c99ae</name>
- <entityField>Classifications</entityField>
- <view>ClassificationTree_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab