1036804 Berechtigung - Entitätsübersicht

entity/PermissionDetail_entity/PermissionDetail_entity.aod

@@ -17,7 +17,6 @@
     <entityField>
       <name>ACTION</name>
       <title>Action</title>
-      <consumer>KeywordAction</consumer>
       <searchable v="false" />
     </entityField>
     <entityField>
@@ -143,22 +142,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>KeywordAction</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordaction/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/PermissionDetail_entity/contentTitleProcess.js

+import("system.logging");
 import("system.vars");
 import("system.result");
 

entity/PermissionDetail_entity/entityfields/keywordaction/children/containername_param/valueProcess.js

-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.permissionAction());

entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js

@@ -16,7 +16,7 @@ var field = vars.get("$field.FIELD");
 var accesstype = vars.get("$field.ACCESSTYPE").trim();
 var condtype = vars.get("$field.CONDTYPE").trim();
 var condition = vars.get("$field.CONDITION");
-var action = vars.get("$field.ACTION").trim();
+var action = vars.get("$field.ACTION");
 
 if (checkInput([role, entity, accesstype, condtype, action])) {
     // calculate accesstype
@@ -56,8 +56,6 @@ if (checkInput([role, entity, accesstype, condtype, action])) {
     }
     
     // insert new permissionaction    
-    // TODO: Actions come from GenericMultiple now, not from Generic anymore (actions input used to be a comma seperated string)
-    logging.log("action: " + action);
     var actionNew = action.split(",");
     logging.log("action new: " + actionNew.toSource());
     for each (let permaction in actionNew) {

entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js

@@ -10,15 +10,12 @@ var table, cols, vals, cond;
 
 var permissionid = vars.get("$field.UID");
 logging.log("permissionid: " + permissionid);
-var actionNew = vars.get("$field.ACTION").trim().split(",");
+var actionNew = vars.get("$field.ACTION").split(",");
 var entityNew = vars.get("$field.ENTITY");
 var permCond = vars.get("$field.CONDITION");
 var permCondType = vars.get("$field.CONDTYPE").trim();
 var diff = PermissionUtil.getActionDiff(permissionid, actionNew);
 
-logging.log("actionNew: " + actionNew.toSource());
-logging.log("diff: " + diff.toSource());
-
 if (diff.length > 0) {
     // delete all linked permission actions
     table = "AB_PERMISSIONACTION";

entity/PermissionMetaData_entity/PermissionMetaData_entity.aod

@@ -5,7 +5,7 @@
   <icon>VAADIN:CONNECT</icon>
   <title>Entities</title>
   <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess>
-  <iconId>VAADIN:CONNECT</iconId>
+  <iconIdProcess>%aditoprj%/entity/PermissionMetaData_entity/iconIdProcess.js</iconIdProcess>
   <recordContainer>jDito</recordContainer>
   <entityFields>
     <entityProvider>

entity/PermissionMetaData_entity/iconIdProcess.js

+import("system.logging");
+import("system.result");
+import("system.project");
+import("system.vars");
+
+var currEntity = vars.get("$field.UID");
+
+if (currEntity != undefined && currEntity != null && currEntity != "") {
+    var entityInfo = project.getDataModel(project.DATAMODEL_KIND_ENTITY, currEntity);
+    if (entityInfo[5] != "") {
+        result.string(entityInfo[5]);
+    } else {
+        result.string("VAADIN:CONNECT");
+    }
+} else {
+    result.string("VAADIN:CONNECT");
+}
\ No newline at end of file

neonView/PermissionDetailEdit_view/PermissionDetailEdit_view.aod

@@ -37,18 +37,11 @@
           <name>c5629444-0aba-4880-a4d8-6352aa4d12e5</name>
           <entityField>CONDITION</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>71e01140-6581-4b5a-8c2c-e8eebe489f38</name>
+          <entityField>ACTION</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <genericMultipleViewTemplate>
-      <name>GenericMultiple</name>
-      <entityField>#ENTITY</entityField>
-      <title>Action</title>
-      <columns>
-        <neonTableColumn>
-          <name>ebf2d3a9-cf44-4e25-a5e7-753c5518497c</name>
-          <entityField>ACTION</entityField>
-        </neonTableColumn>
-      </columns>
-    </genericMultipleViewTemplate>
   </children>
 </neonView>

neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod

@@ -27,18 +27,11 @@
           <name>dd33df7a-82e6-49a8-b35f-99d0187970e3</name>
           <entityField>CONDITION</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>d113c6e9-cb6e-4873-85c8-528de4da4bb7</name>
+          <entityField>ACTION</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <genericMultipleViewTemplate>
-      <name>GenericMultiple</name>
-      <entityField>#ENTITY</entityField>
-      <title>Action</title>
-      <columns>
-        <neonTableColumn>
-          <name>a11c2bad-7481-4376-adeb-6728f42254ee</name>
-          <entityField>ACTION</entityField>
-        </neonTableColumn>
-      </columns>
-    </genericMultipleViewTemplate>
   </children>
 </neonView>