From da28273888e3a5c6fdca174d2c646e0b2db31168 Mon Sep 17 00:00:00 2001
From: "S.Leipold" <S.Leipold@sleipold.aditosoftware.local>
Date: Fri, 10 May 2019 14:57:16 +0200
Subject: [PATCH] =?UTF-8?q?1036804=20Berechtigung=20-=20Entit=C3=A4ts?=
=?UTF-8?q?=C3=BCbersicht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../_____SYSTEM_APPLICATION_NEON.aod | 2 ++
.../PermissionAction_entity.aod | 2 +-
.../PermissionAdmin_entity.aod | 4 ++--
.../PermissionDetail_entity.aod | 7 +++++--
...titleProcess.js => contentTitleProcess.js} | 0
.../condtype/displayValueProcess.js | 2 +-
.../entityfields/entity/valueProcess.js | 7 +++++++
.../entityfields/role/valueProcess.js | 7 +++++++
.../PermissionMetaData_entity.aod | 19 ++++++++++++++-----
...titleProcess.js => contentTitleProcess.js} | 0
.../children/entityname_param/valueProcess.js | 3 +++
.../PermissionOverview_entity.aod | 3 ++-
.../PermissionSet_entity.aod | 6 +++---
...titleProcess.js => contentTitleProcess.js} | 0
.../Permission_entity/Permission_entity.aod | 2 +-
entity/Role_entity/Role_entity.aod | 8 +++-----
...titleProcess.js => contentTitleProcess.js} | 0
.../PermissionOverviewFilter_view.aod | 17 +++++++----------
18 files changed, 58 insertions(+), 31 deletions(-)
rename entity/PermissionDetail_entity/{titleProcess.js => contentTitleProcess.js} (100%)
create mode 100644 entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
create mode 100644 entity/PermissionDetail_entity/entityfields/role/valueProcess.js
rename entity/PermissionMetaData_entity/{titleProcess.js => contentTitleProcess.js} (100%)
create mode 100644 entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js
rename entity/PermissionSet_entity/{titleProcess.js => contentTitleProcess.js} (100%)
rename entity/Role_entity/{titleProcess.js => contentTitleProcess.js} (100%)
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index eba6a090217..c7885b16e57 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -43,6 +43,8 @@
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
<node name="ObjectRelationType" kind="10077" />
+ <node name="PermissionMetaData" kind="10077" />
+ <node name="Role" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index e83f384288a..8cc0fe990e0 100644
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>PermissionAction_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<iconId>VAADIN:SHIELD</iconId>
diff --git a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod b/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
index 02987cdea0e..9ae9e623229 100644
--- a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
+++ b/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>PermissionAdmin_entity</name>
- <title>Permission Admin</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Permission Admin</title>
<iconId>VAADIN:SHIELD</iconId>
<recordContainer>JDito</recordContainer>
<entityFields>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 88d71e1a4bd..ee58307dd41 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>PermissionDetail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Permission Detail</title>
+ <contentTitleProcess>%aditoprj%/entity/PermissionDetail_entity/contentTitleProcess.js</contentTitleProcess>
<iconIdProcess>%aditoprj%/entity/PermissionDetail_entity/iconIdProcess.js</iconIdProcess>
- <titleProcess>%aditoprj%/entity/PermissionDetail_entity/titleProcess.js</titleProcess>
<recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
@@ -25,6 +26,7 @@
<consumer>Roles</consumer>
<linkedContext>Role</linkedContext>
<groupable v="true" />
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ENTITY</name>
@@ -32,6 +34,7 @@
<consumer>MetaData</consumer>
<linkedContext>PermissionMetaData</linkedContext>
<groupable v="true" />
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FIELD</name>
diff --git a/entity/PermissionDetail_entity/titleProcess.js b/entity/PermissionDetail_entity/contentTitleProcess.js
similarity index 100%
rename from entity/PermissionDetail_entity/titleProcess.js
rename to entity/PermissionDetail_entity/contentTitleProcess.js
diff --git a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
index d6026ea916d..8d0ed5002ab 100644
--- a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.permissionConditionType(), vars.get("$field.CONDTYPE")));
+//result.string(KeywordUtils.getViewValue($KeywordRegistry.permissionConditionType(), vars.get("$field.CONDTYPE")));
diff --git a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
new file mode 100644
index 00000000000..ace2def782d
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.exists("$param.EntityTitle_param")) {
+ result.string(vars.getString("$param.EntityTitle_param"));
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
new file mode 100644
index 00000000000..ce210d3aefb
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.exists("$param.RoleTitle_param")) {
+ result.string(vars.getString("$param.RoleTitle_param"));
+}
\ No newline at end of file
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index f12dbb0c024..650ac71d939 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>PermissionMetaData_entity</name>
- <title>Entities</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:CONNECT</icon>
+ <title>Entities</title>
+ <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:CONNECT</iconId>
- <titleProcess>%aditoprj%/entity/PermissionMetaData_entity/titleProcess.js</titleProcess>
<recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
@@ -35,10 +35,15 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>EntityName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>PermissionOverviews</name>
- <title>Permission Overview</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -54,7 +59,6 @@
</entityConsumer>
<entityConsumer>
<name>PermissionDetails</name>
- <title>Permission Detail</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -68,6 +72,11 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>EntityName_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/PermissionMetaData_entity/titleProcess.js b/entity/PermissionMetaData_entity/contentTitleProcess.js
similarity index 100%
rename from entity/PermissionMetaData_entity/titleProcess.js
rename to entity/PermissionMetaData_entity/contentTitleProcess.js
diff --git a/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js b/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js
new file mode 100644
index 00000000000..f7920ec1e28
--- /dev/null
+++ b/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index a34ba47055c..a9c32b001df 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>PermissionOverview_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Permission Overview</title>
<iconIdProcess>%aditoprj%/entity/PermissionOverview_entity/iconIdProcess.js</iconIdProcess>
<recordContainer>jDito</recordContainer>
<entityFields>
diff --git a/entity/PermissionSet_entity/PermissionSet_entity.aod b/entity/PermissionSet_entity/PermissionSet_entity.aod
index de974d45966..1a764046c8c 100644
--- a/entity/PermissionSet_entity/PermissionSet_entity.aod
+++ b/entity/PermissionSet_entity/PermissionSet_entity.aod
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>PermissionSet_entity</name>
- <title>Permission Set</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Permission Set</title>
+ <contentTitleProcess>%aditoprj%/entity/PermissionSet_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:SHIELD</iconId>
- <titleProcess>%aditoprj%/entity/PermissionSet_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/PermissionSet_entity/titleProcess.js b/entity/PermissionSet_entity/contentTitleProcess.js
similarity index 100%
rename from entity/PermissionSet_entity/titleProcess.js
rename to entity/PermissionSet_entity/contentTitleProcess.js
diff --git a/entity/Permission_entity/Permission_entity.aod b/entity/Permission_entity/Permission_entity.aod
index d3fdc6c6a46..662f10fbb47 100644
--- a/entity/Permission_entity/Permission_entity.aod
+++ b/entity/Permission_entity/Permission_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>Permission_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<iconId>VAADIN:SHIELD</iconId>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index bcdfece711c..9bdf9796688 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+<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>Role_entity</name>
- <title>Roles</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:USER_CHECK</icon>
+ <title>Roles</title>
+ <contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:USER_CHECK</iconId>
- <titleProcess>%aditoprj%/entity/Role_entity/titleProcess.js</titleProcess>
<recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
@@ -31,7 +31,6 @@
</entityField>
<entityConsumer>
<name>Permissions</name>
- <title>Permission Detail</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -47,7 +46,6 @@
</entityConsumer>
<entityConsumer>
<name>PermissionOverviews</name>
- <title>Permission Overview</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Role_entity/titleProcess.js b/entity/Role_entity/contentTitleProcess.js
similarity index 100%
rename from entity/Role_entity/titleProcess.js
rename to entity/Role_entity/contentTitleProcess.js
diff --git a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
index 6de32f41d09..456775fc326 100644
--- a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
+++ b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
@@ -12,37 +12,34 @@
<children>
<tableViewTemplate>
<name>Table</name>
- <hideActions v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>d243e0d8-10ff-435a-9245-38d873557150</name>
+ <name>2d83af69-cafe-471c-92de-0e6e66ba51aa</name>
<entityField>#ICON</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>f47e1e21-d0fa-4102-a5f3-2f3281ecd5c0</name>
+ <name>16c4d649-ec91-415d-9768-78d0581ad44a</name>
<entityField>ENTITY</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>bb518bdd-3a6c-4761-9d3c-ecedc331c6b4</name>
+ <name>f3e96f53-fb65-4b98-a189-cead544c17d8</name>
<entityField>ACTION_VIEW</entityField>
- <width v="75" />
- <expandRatio v="100" />
</neonTableColumn>
<neonTableColumn>
- <name>9f01ee57-d226-40f4-9f33-2816127e5d8c</name>
+ <name>d21161a7-51e8-4c83-9c92-b6a0d24ddc62</name>
<entityField>ACTION_CREATE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>bd0a77cd-de29-4245-812e-568346d6a1c3</name>
+ <name>c5679586-7f99-4ea5-99f4-94422e70c999</name>
<entityField>ACTION_READ</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>ce935da4-f288-4649-9f87-025b631016f0</name>
+ <name>0699fd7b-d4ac-4ef8-ac19-1cd249ce3251</name>
<entityField>ACTION_EDIT</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>b4249ba5-ed1e-4d48-80d0-c295d6d2e6fc</name>
+ <name>f7c3479e-e635-44f1-afc0-45570c4fffe9</name>
<entityField>ACTION_DELETE</entityField>
</neonTableColumn>
</columns>
--
GitLab