From 640bed828d675c3a47b1d0a38bc0505d97e36086 Mon Sep 17 00:00:00 2001
From: Nico Bugl <n.bugl@adito.de>
Date: Wed, 5 Jun 2019 13:33:22 +0200
Subject: [PATCH] Fix
---
.../_____SYSTEM_APPLICATION.aod | 7 +-
.../_____SYSTEM_APPLICATION_NEON.aod | 213 ++++--------------
.../_____SYSTEM_CALENDAR_RIBBON.aod | 7 +-
.../_____SYSTEM_CALENDAR_RIBBON_NEON.aod | 7 +-
.../_____SYSTEM_INDEXSEARCH_RIBBON.aod | 7 +-
.../_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod | 7 +-
6 files changed, 57 insertions(+), 191 deletions(-)
diff --git a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
index ec11a32ebe4..28c9a9453c2 100644
--- a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
+++ b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_APPLICATION</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode>
- <name>entityNode</name>
- <kind v="200" />
- </entityNode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
<company>
<name>company</name>
<backgroundColor v="0xff83cbd8" />
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 542643a1962..3ff69433612 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -1,172 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_APPLICATION_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode>
- <name>entityNode</name>
- <kind v="200" />
- <childNodes>
- <entityNode>
- <name>CONTACTS</name>
- <kind v="123" />
- <title>Contactmanagement</title>
- <icon>VAADIN:CONNECT</icon>
- <childNodes>
- <entityNode>
- <name>Group1</name>
- <kind v="123" />
- <title></title>
- <childNodes>
- <entityNode>
- <name>Person</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Organisation</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Activity</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Task</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>INTERNAL_ADMINISTRATOR</name>
- <kind v="159" />
- </entityNode>
- </childNodes>
- </entityNode>
- </childNodes>
- </entityNode>
- <entityNode>
- <name>SALES</name>
- <kind v="123" />
- <title>Sales</title>
- <icon>VAADIN:BRIEFCASE</icon>
- <childNodes>
- <entityNode>
- <name>Group2</name>
- <kind v="123" />
- <title></title>
- <childNodes>
- <entityNode>
- <name>Vertriebsdashboard</name>
- <kind v="10090" />
- </entityNode>
- <entityNode>
- <name>Salesproject</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Offer</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Order</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Contract</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Product</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Turnover</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>INTERNAL_ADMINISTRATOR</name>
- <kind v="159" />
- </entityNode>
- </childNodes>
- </entityNode>
- </childNodes>
- </entityNode>
- <entityNode>
- <name>Marketing</name>
- <kind v="123" />
- <title>Marketing</title>
- <icon>VAADIN:GROUP</icon>
- <childNodes>
- <entityNode>
- <name>Group4</name>
- <kind v="123" />
- <title></title>
- <childNodes>
- <entityNode>
- <name>Campaign</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>INTERNAL_ADMINISTRATOR</name>
- <kind v="159" />
- </entityNode>
- </childNodes>
- </entityNode>
- </childNodes>
- </entityNode>
- <entityNode>
- <name>ADMINISTRATION</name>
- <kind v="123" />
- <title>Administration</title>
- <icon>VAADIN:CONTROLLER</icon>
- <childNodes>
- <entityNode>
- <name>Group3</name>
- <kind v="123" />
- <title></title>
- <childNodes>
- <entityNode>
- <name>Notification</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Attribute</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>DocumentTemplate</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Employee</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>KeywordEntry</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>KeywordAttribute</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>ObjectRelationType</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>ClassificationAdmin</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>Salutation</name>
- <kind v="10077" />
- </entityNode>
- <entityNode>
- <name>INTERNAL_ADMINISTRATOR</name>
- <kind v="159" />
- </entityNode>
- </childNodes>
- </entityNode>
- </childNodes>
- </entityNode>
- </childNodes>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200">
+ <node name="CONTACTS" kind="123" title="Contactmanagement">
+ <icon>VAADIN:CONNECT</icon>
+ <node name="Group1" kind="123" title="">
+ <node name="Person" kind="10077" />
+ <node name="Organisation" kind="10077" />
+ <node name="Activity" kind="10077" />
+ <node name="Task" kind="10077" />
+ <node name="INTERNAL_ADMINISTRATOR" kind="159" />
+ </node>
+ </node>
+ <node name="SALES" kind="123" title="Sales">
+ <icon>VAADIN:BRIEFCASE</icon>
+ <node name="Group2" kind="123" title="">
+ <node name="Vertriebsdashboard" kind="10090" />
+ <node name="Salesproject" kind="10077" />
+ <node name="Offer" kind="10077" />
+ <node name="Order" kind="10077" />
+ <node name="Contract" kind="10077" />
+ <node name="Product" kind="10077" />
+ <node name="Turnover" kind="10077" />
+ <node name="INTERNAL_ADMINISTRATOR" kind="159" />
+ </node>
+ </node>
+ <node name="Marketing" kind="123" title="Marketing">
+ <icon>VAADIN:GROUP</icon>
+ <node name="Group4" kind="123" title="">
+ <node name="Campaign" kind="10077" />
+ <node name="INTERNAL_ADMINISTRATOR" kind="159" />
+ </node>
+ </node>
+ <node name="ADMINISTRATION" kind="123" title="Administration">
+ <icon>VAADIN:CONTROLLER</icon>
+ <node name="Group3" kind="123" title="">
+ <node name="Notification" kind="10077" />
+ <node name="Attribute" kind="10077" />
+ <node name="DocumentTemplate" kind="10077" />
+ <node name="Employee" kind="10077" />
+ <node name="KeywordEntry" kind="10077" />
+ <node name="KeywordAttribute" kind="10077" />
+ <node name="ObjectRelationType" kind="10077" />
+ <node name="ClassificationAdmin" kind="10077" />
+ <node name="Salutation" kind="10077" />
+ <node name="INTERNAL_ADMINISTRATOR" kind="159" />
+ </node>
+ </node>
</entityNode>
<company>
<name>company</name>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
index 9c0722a0cb6..42fef1c4124 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_CALENDAR_RIBBON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode>
- <name>entityNode</name>
- <kind v="200" />
- </entityNode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
<calendarRibbon>
<name>calendarRibbon</name>
<ribbonTasks>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
index d75ce776afb..e453d3efffa 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode>
- <name>entityNode</name>
- <kind v="200" />
- </entityNode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
<neonCalendarRibbon>
<name>neonCalendarRibbon</name>
<entity>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
index aed93b8da3a..114ee28146d 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode>
- <name>entityNode</name>
- <kind v="200" />
- </entityNode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
<indexSearchRibbon>
<name>indexSearchRibbon</name>
<ribbonTasks>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
index 45edac7e715..31b4562eb67 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode>
- <name>entityNode</name>
- <kind v="200" />
- </entityNode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
<neonIndexSearchRibbon>
<name>neonIndexSearchRibbon</name>
</neonIndexSearchRibbon>
--
GitLab