diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index 3046fae22e66262330c329219d0062d0497a6051..401bfb1c3edaf1da3612a3b8d8783d7d5971cf75 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -63,13 +63,16 @@ for each (var element in rolesOrEntities)
     
     if (entityPermSetId)
     {
+        // add entity permissions to overview
+        overviewElement = prepareOverviewElement(entityPermSetId, overviewElement);
+        
         var recordPermSetId = PermissionUtil.getRecordSetOfEntitySet(entityPermSetId);
         
-        // entity permissions
-        overviewElement = prepareOverviewElement(entityPermSetId, overviewElement);
-
-        // record permissions
-        overviewElement = prepareOverviewElement(recordPermSetId, overviewElement);
+        if (recordPermSetId)
+        {
+            // add record permissions to overview
+            overviewElement = prepareOverviewElement(recordPermSetId, overviewElement);    
+        } 
 
         overview.push([overviewElement.uid, overviewElement.entity, overviewElement.role, overviewElement.view, overviewElement.create, overviewElement.read, 
             overviewElement.update, overviewElement["delete"], overviewElement.parent]);
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index 0273d9b02dbc9161d1ac4af462398653c131999c..bcd5ad4035ff94f8d62aa4daa1fa23035ee59d87 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -1,3 +1,7 @@
+import("system.translate");
+import("Context_lib");
+import("system.logging");
+import("system.neon");
 import("system.vars");
 import("system.tools");
 import("system.SQLTYPES");
@@ -52,6 +56,10 @@ PermissionEnums.RESTRICTED_ACTION_ICON = function () {
 PermissionEnums.FORBIDDEN_ACTION_ICON = function () {
     return "VAADIN:CLOSE";
 }
+PermissionEnums.NO_PERMISSION = function () {
+    return "NO_PERMISSION";
+}
+
 
 /**
  * Provides functions to work with permissions.
@@ -923,14 +931,14 @@ function PermissionUtil () {}
      * 
      * @param {String} pEntitySetId ID of the entity permission set
      * 
-     * @result {String[]} returns the id of the record permission set
+     * @result {String} returns the id of the record permission set
      */
     PermissionUtil.getRecordSetOfEntitySet = function(pEntitySetId) {
         return newSelect("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", alias)
         .from("ASYS_PERMISSIONSET")
         .where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSET_ID", pEntitySetId)
         .and("ASYS_PERMISSIONSET.ACCESSTYPE", PermissionEnums.ACCESSTYPE_RECORD())
-        .arrayColumn();
+        .cell();
     }
     
     /**
@@ -983,6 +991,120 @@ function PermissionUtil () {}
         });
     }
     
+    /**
+     * Returns the permission result for a given object.
+     * 
+     * @param pObjectType the type of the object, e.g. "Organisation".
+     * 
+     * @param pObjectRowId the id of the object.
+     * 
+     * @param pRecordState the current record state.
+     * 
+     * @param pUser the user.
+     * 
+     * @return {Object{}} returns an object with a status to react accordingly in stateProcesses and a title for display.
+     */
+    PermissionUtil.getPermissionResult = function(pObjectType, pObjectRowId, pRecordState, pUser)
+    {
+        var NO_PERMISSION_TITLE = translate.text("No Permission");
+        var DEFAULT_ERROR = translate.text("Error");
+        
+        var res = {
+            status: null, 
+            title: null
+        };
+        
+        if(pRecordState != neon.OPERATINGSTATE_NEW && pObjectType) 
+        {
+            var entity = ContextUtils.getEntity(pObjectType);
+            if (tools.hasPermission(tools.PERMISSION_VIEW, entity, null, pUser, null))
+            {
+                if (pObjectRowId)
+                {
+                    try {
+                        if (tools.hasPermission(tools.PERMISSION_READ, entity, null, pUser, [pObjectRowId]))
+                        {
+                            res = {
+                                status: tools.PERMISSION_READ, 
+                                title: ContextUtils.getTitleByContext(pObjectType, pObjectRowId)
+                            };
+                        }
+                        else
+                        {
+                            res = {
+                                status: tools.PERMISSION_VIEW, 
+                                title: NO_PERMISSION_TITLE
+                            };
+                        }
+                    } 
+                    catch (err)
+                    {
+                        // display "no permission" if there was an error while calculating permissions
+                        if (err.fileName == "Permission_lib")
+                        {
+                            res = {
+                                status: tools.PERMISSION_VIEW, 
+                                title: NO_PERMISSION_TITLE
+                            };
+                        }
+                        else
+                        {
+                            // otherwise display a default error message
+                            res = {
+                                status: tools.PERMISSION_VIEW, 
+                                title: DEFAULT_ERROR
+                            };
+                        }
+                        
+                        logging.log(err);
+                    }
+                }
+                else
+                {
+                    res = {
+                        status: tools.PERMISSION_VIEW, 
+                        title: NO_PERMISSION_TITLE
+                    };
+                }
+            }
+            else
+            {
+                res = {
+                    status: PermissionEnums.NO_PERMISSION(),
+                    title: NO_PERMISSION_TITLE
+                };
+            }
+        }
+        
+        return res;
+    }
+    
+    /**
+     * Returns the visibility for a given object determined by the permission result.
+     * 
+     * @param pPermissionResult as object. Has to contain the property 'status'.
+     * 
+     * @param pRecordState the current record state.
+     * 
+     * @return {String} returns the visibility determined by the permission result.
+     */
+    PermissionUtil.getVisibilityByPermissionResult = function(pPermissionResult, pRecordState)
+    {
+        if (pRecordState != neon.OPERATINGSTATE_NEW)
+        {
+            switch (pPermissionResult.status)
+            {
+                case tools.PERMISSION_VIEW:
+                    return neon.COMPONENTSTATE_READONLY;
+                case tools.PERMISSION_READ:
+                    return neon.COMPONENTSTATE_EDITABLE;
+                default:
+                    return neon.COMPONENTSTATE_INVISIBLE;
+            }
+        }
+        return neon.COMPONENTSTATE_AUTO;
+    }
+
 } //end of block