Permissions - changed title, fixed field state and made condition type invisible

entity/PermissionDetail_entity/contentTitleProcess.js

@@ -6,10 +6,12 @@ var res = "";
 
 switch (vars.get("$field.ACCESSTYPE")) {
     case "E":
-        if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
+        if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param") && vars.get("$field.ENTITY") != "") {
             res += vars.get("$field.ENTITY");
-        } else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
+        } else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param") && vars.get("$field.ROLE") != "") {
             res += vars.get("$field.ROLE");
+        } else {
+            res += "?";
         }
         break;
     case "R":

entity/PermissionDetail_entity/entityfields/field/stateProcess.js

+import("system.project");
 import("system.result");
 import("system.neon");
 import("system.vars");
@@ -11,5 +12,11 @@ rootPermSet = PermissionUtil.getRootPermissionSet(role, entity);
 if (rootPermSet == "") {
     result.string(neon.COMPONENTSTATE_DISABLED);
 } else {
-    result.string(neon.COMPONENTSTATE_EDITABLE);
+    entityStructure = project.getEntityStructure(entity);
+    for (fieldname in entityStructure.fields) {
+        field = entityStructure.fields[fieldname];
+        if (field.usePermissions == true) {
+            result.string(neon.COMPONENTSTATE_EDITABLE)
+        }
+    }
 }
\ No newline at end of file

neonView/PermissionDetailEdit_view/PermissionDetailEdit_view.aod

@@ -29,10 +29,6 @@
           <name>340d1206-e5fb-4337-b298-b44286461f8b</name>
           <entityField>ACCESSTYPE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>be5b7d60-ec7a-446c-b360-1583d2262d86</name>
-          <entityField>CONDTYPE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>c5629444-0aba-4880-a4d8-6352aa4d12e5</name>
           <entityField>CONDITION</entityField>