Permissions - refreshing after del/edit, refactoring and fixing display value bugs

entity/PermissionDetail_entity/PermissionDetail_entity.aod

@@ -66,7 +66,6 @@
       <title>Condition Type</title>
       <consumer>KeywordConditionType</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>

entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js

+import("system.neon");
 import("system.vars");
 import("system.result");
 import("Permission_lib");
 
+var operatingState = vars.get("$sys.operatingstate");
 var field = vars.get("$field.FIELD");
 var role = vars.get("$field.ROLE");
 var entity = vars.get("$field.ENTITY");
+var accesstype = vars.get("$field.ACCESSTYPE");
 var rootPermSet = PermissionUtil.getRootPermissionSet(role, entity);
 
-if (rootPermSet == "") {
-    result.string("Entität");
+if (operatingState == neon.OPERATINGSTATE_SEARCH || neon.OPERATINGSTATE_VIEW) {
+    switch (accesstype) {
+        case "E":
+            result.string("Entität");
+            break;
+        case "R":
+            result.string("Datensatz");
+            break;
+        case "F":
+            result.string("Feld");
+            break;
+    }
 } else {
-    result.string("Datensatz");
-} 
+    // editing/creating a new permission
+    // if there is no permission set for a given role-entity-combination -> permission has to be Entity
+    // otherwise Record
+    // if $field.FIELD is filled, then its a permission on Field access level
+    if (rootPermSet == "") {
+        result.string("Entität");
+    } else {
+        result.string("Datensatz");
+    } 
 
-if (field != undefined && field != null && field != "") {
-    result.string("Feld");
+    if (field != undefined && field != null && field != "") {
+        result.string("Feld");
+    }
 }
\ No newline at end of file

entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js

-import("system.result");
-
-result.string("true");
\ No newline at end of file

entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js

+import("system.neon");
 import("system.db");
 import("system.vars");
 import("Permission_lib");
@@ -48,3 +49,5 @@ switch (accessType) {
 if (PermissionUtil.permSetIsEmpty(parentPermSetId)) {
     db.deleteData("ASYS_PERMISSIONSET", sqlCondDelPermSet, alias); // delete empty permissionset
 }
+
+neon.refreshAll();
\ No newline at end of file

entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js

+import("system.neon");
 import("system.logging");
 import("system.util");
 import("system.db");
@@ -31,3 +32,5 @@ PermissionUtil.updateIfDiff(permissionid, permCond, "COND", "ASYS_PERMISSION");
 PermissionUtil.updateIfDiff(permissionid, permCondType, "CONDTYPE", "ASYS_PERMISSION"); // updates CONDTYPE if the new condtype is different to CONDTYPE in DB
 // entity of children has to be changed/deleted/ignored?
 // PermissionUtil.updateIfDiff(PermissionUtil.getParentPermissionSet(permissionid), entityNew, "ENTITY_ID", "ASYS_PERMISSIONSET");
+
+neon.refreshAll(); 
\ No newline at end of file