resolved conflicts

entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js

@@ -18,37 +18,33 @@ var entitiesUsePermFlagSet = []; // array, which contains ids of entities with u
 // gets all names of the entites which have the 'usePermission'-flag set (positive list)
 for each (let entityMetaData in entitiesMetaData) {
     if (entityMetaData[6] == "true") {
-        entitiesUsePermFlagSet.push(entityMetaData[0])
-        if (PermissionUtil.getNumberOfPermissions(entityMetaData[0]) == 0) {
-            // no permissions found for the given entity -> create permissionset for role INTERNAL_EVERYONE with five X's for view, create, read, edit, delete         
-            var noAccessPermissionSetIdEntity = PermissionUtil.insertSet("", entityMetaData[0], roleInternalEveryone, "", "E");
-            PermissionUtil.insertPermission(noAccessPermissionSetIdEntity, "", 0); // 0 is an indicator for PermissionDetails so the user can create a new PermissionSet on access level "E"
-        }
+        entitiesUsePermFlagSet.push(entityMetaData[0]);
     }
 }
 
-var rolesOrEntitiesSelect = new SqlBuilder(alias).where();
-var rolesOrEntities = [];
-// select nothing if no entities have the perm flag set
-if (entitiesUsePermFlagSet.length > 0)
-{
-    if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
-        roleTitle = vars.getString("$param.RoleTitle_param");
-        rolesOrEntitiesSelect.select("distinct ENTITY_ID")
-                            .from("ASYS_PERMISSIONSET")
-                            .and("ASYS_PERMISSIONSET.ROLE_ID", roleTitle)
-    } 
-    else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) 
-    {
-        entityTitle = vars.getString("$param.EntityTitle_param");
-        rolesOrEntitiesSelect.select("distinct ROLE_ID")
-                            .from("ASYS_PERMISSIONSET")
-                            .and("ASYS_PERMISSIONSET.ENTITY_ID", entityTitle)
+var sqlCondEntityUsePermFlagSet = " and ENTITY_ID in ('" + entitiesUsePermFlagSet.join("','") + "')";
+
+if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
+    roleTitle = vars.getString("$param.RoleTitle_param");
+    if (roleTitle == roleInternalEveryone) {
+        var counter = 0;
+        for each (let entityUsePermFlagSet in entitiesUsePermFlagSet) {
+            if (PermissionUtil.getNumberOfPermissions(entityUsePermFlagSet, roleTitle) == 0) {
+                // no permissions for INTERNAL_EVERYONE found -> display X's for all actions
+                res.push(["NOREALPERMINDB" + counter++, entityUsePermFlagSet, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"]);
+            }
+        }
     }
-    
-    rolesOrEntities = rolesOrEntitiesSelect
-                           .and("ASYS_PERMISSIONSET.ENTITY_ID", entitiesUsePermFlagSet, SqlBuilder.IN())
-                           .arrayColumn();
+    sqlCond = " where ROLE_ID = '" + roleTitle + "'";
+    sqlStr = "select distinct ENTITY_ID from ASYS_PERMISSIONSET" + sqlCond + sqlCondEntityUsePermFlagSet;
+} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
+    entityTitle = vars.getString("$param.EntityTitle_param");
+    if (PermissionUtil.getNumberOfPermissions(entityTitle, roleInternalEveryone) == 0) {
+        // no permissions for INTERNAL_EVERYONE found -> display X's for all actions
+        res.push(["NOREALPERMINDB", roleInternalEveryone, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"]);
+    }
+    sqlCond = " where ENTITY_ID = '" + entityTitle + "'";
+    sqlStr = "select distinct ROLE_ID from ASYS_PERMISSIONSET" + sqlCond + sqlCondEntityUsePermFlagSet;
 }
 
 

process/autostartNeon/process.js

@@ -16,20 +16,3 @@ for(var i = 0; i < usersTools.length; i++)
 
 calendars.setCalendarUser(users, calendars.RIGHT_READ | calendars.RIGHT_WRITE, false, calendars.SORTSTRATEGY_NATURAL);
 calendars.setCheckAttendeesOnWrite(false);
-
-// permissions - creating default permission (with no actions) for role everyone
-var entitiesMetaData = project.getDataModels(project.DATAMODEL_KIND_ENTITY);
-var entitiesUsePermFlagSet = []; // array, which contains ids of entities with usePermission flag set
-var roleInternalEveryone = "INTERNAL_EVERYONE";
-
-// gets all names of the entites which have the 'usePermission'-flag set (positive list)
-for each (let entityMetaData in entitiesMetaData) { // TODO: replace "for each (.. in ..)" with for (.. of ..) when the designer supports it (the server already supports it). As it's deprecated in js https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Statements/for_each...in
-    if (entityMetaData[6] == "true") {
-        entitiesUsePermFlagSet.push(entityMetaData[0])
-        if (PermissionUtil.getNumberOfPermissions(entityMetaData[0]) == 0) {
-            // no permissions found for the given entity -> create permissionset for role INTERNAL_EVERYONE with five X's for view, create, read, update, delete         
-            var noAccessPermissionSetIdEntity = PermissionUtil.insertSet("", entityMetaData[0], roleInternalEveryone, "", "E");
-            PermissionUtil.insertPermission(noAccessPermissionSetIdEntity, "", 0); // 0 is an indicator for PermissionDetails so the user can create a new PermissionSet on access level "E"
-        }
-    }
-}