1036804 Berechtigung - Entitätsübersicht

da282738 · S.Leipold · 3a958326 · da282738 · da282738 · da282738
Commit da282738 authored 5 years ago by S.Leipold
--- 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>

--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
 <?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>

--- a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
+++ b/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod
 <?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>

--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
 <?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>

--- a/entity/PermissionDetail_entity/titleProcess.js
+++ b/entity/PermissionDetail_entity/titleProcess.js
--- 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")));
--- a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
+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
--- a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
+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
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
 <?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>

--- a/entity/PermissionMetaData_entity/titleProcess.js
+++ b/entity/PermissionMetaData_entity/titleProcess.js
--- a/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js
+++ b/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.TITLE"));
\ No newline at end of file
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
 <?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>

--- a/entity/PermissionSet_entity/PermissionSet_entity.aod
+++ b/entity/PermissionSet_entity/PermissionSet_entity.aod
 <?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>

--- a/entity/PermissionSet_entity/titleProcess.js
+++ b/entity/PermissionSet_entity/titleProcess.js
--- a/entity/Permission_entity/Permission_entity.aod
+++ b/entity/Permission_entity/Permission_entity.aod
 <?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>

--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
 <?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>

--- a/entity/Role_entity/titleProcess.js
+++ b/entity/Role_entity/titleProcess.js
--- 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>