From df83cc43e983c848092367f62ac67cfd6f560138 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 10 May 2019 16:42:28 +0200
Subject: [PATCH] classification refactorings
---
.../ClassificationAdmin_entity.aod | 2 ++
.../ClassificationScore_entity.aod | 3 +++
.../ClassificationAdmin.aod | 4 ----
.../ClassificationAdminFilter_view.aod | 1 +
.../ClassificationAdminPreview_view.aod | 22 -------------------
5 files changed, 6 insertions(+), 26 deletions(-)
delete mode 100644 neonView/ClassificationAdminPreview_view/ClassificationAdminPreview_view.aod
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 8e86173ada..c5b3232e4f 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -2,6 +2,8 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>ClassificationAdmin_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Classification</title>
+ <titlePlural>Classifications</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 0933b3602c..33a68efe1c 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -17,6 +17,7 @@
<entityField>
<name>TITLE</name>
<title>Title</title>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>SCORETYPE</name>
@@ -25,10 +26,12 @@
<entityField>
<name>SORT</name>
<title>Sorting</title>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>SCORE</name>
<title>Score</title>
+ <mandatory v="true" />
<onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
</entityField>
<entityProvider>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index 296fce6a2f..39b6239be4 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -14,9 +14,5 @@
<name>4a240156-6c62-46d8-890e-b5c239ef8128</name>
<view>ClassificationAdminMain_view</view>
</neonViewReference>
- <neonViewReference>
- <name>e06c0c1c-6b3e-4e99-8ecd-60df46dea7a3</name>
- <view>ClassificationAdminPreview_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
index 3185915eb0..0e582bf507 100644
--- a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -10,6 +10,7 @@
<children>
<tableViewTemplate>
<name>Classificationtypes</name>
+ <hideActions v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ClassificationAdminPreview_view/ClassificationAdminPreview_view.aod b/neonView/ClassificationAdminPreview_view/ClassificationAdminPreview_view.aod
deleted file mode 100644
index 8bb7c62edf..0000000000
--- a/neonView/ClassificationAdminPreview_view/ClassificationAdminPreview_view.aod
+++ /dev/null
@@ -1,22 +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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ClassificationAdminPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>types</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d18277be-25d4-4e67-84e1-e14f070de2dd</name>
- <entityField>UID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
--
GitLab