diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod index a963e64789b745557808d88c0dac4d91c59a8096..d0037f8f85b1fc9ee8de4ae3b9ee4e2f425e5f9a 100644 --- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod +++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod @@ -202,6 +202,7 @@ <jDitoRecordContainer> <name>jDito</name> <jDitoRecordAlias>Data_alias</jDitoRecordAlias> + <isSortable v="true" /> <contentProcess>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js</contentProcess> <onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert> <onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate> diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js index 1eb5be5c63d2298420150d94b7b492bfcb54ee26..def0c1cc3c3e31886fcfadb14db53f5ab1a37051 100644 --- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js @@ -19,12 +19,7 @@ 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]); } } @@ -32,10 +27,23 @@ var sqlCondEntityUsePermFlagSet = " and ENTITY_ID in ('" + entitiesUsePermFlagSe 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"]); + } + } + } 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; } diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod index c2030bfbb260cea11e1742424f10d126203e60ee..8f0913a12f364efd833a4390062495b8e45fa3f6 100644 --- a/entity/Role_entity/Role_entity.aod +++ b/entity/Role_entity/Role_entity.aod @@ -31,6 +31,7 @@ </entityField> <entityField> <name>USERCOUNT</name> + <title>Amount</title> </entityField> <entityConsumer> <name>Permissions</name> diff --git a/neonView/RolePreview_view/RolePreview_view.aod b/neonView/RolePreview_view/RolePreview_view.aod index c292b9f37d4db1e5a808dd474808959f87a4e406..62524dd0c7838bdffd51dd9eb631049c333a3655 100644 --- a/neonView/RolePreview_view/RolePreview_view.aod +++ b/neonView/RolePreview_view/RolePreview_view.aod @@ -11,8 +11,9 @@ <cardViewTemplate> <name>Card</name> <iconField>#ICON</iconField> - <titleField>ROLETITLE</titleField> - <subtitleField>USERCOUNT</subtitleField> + <titleField>UID</titleField> + <subtitleField>ROLETITLE</subtitleField> + <descriptionField>USERCOUNT</descriptionField> <entityField>#ENTITY</entityField> </cardViewTemplate> <genericViewTemplate> diff --git a/process/autostartNeon/process.js b/process/autostartNeon/process.js index 03e2714f7ed4b863367e4783c016eeed33be0bc7..daee3c2fdc37f9d91604fc793837879f57145585 100644 --- a/process/autostartNeon/process.js +++ b/process/autostartNeon/process.js @@ -15,21 +15,4 @@ 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) { - 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" - } - } -} +calendars.setCheckAttendeesOnWrite(false); \ No newline at end of file