Skip to content
Snippets Groups Projects
Commit b4927309 authored by Simon Leipold's avatar Simon Leipold Committed by S.Leipold
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1071297][[Rollen] - keine...

[Projekt: Entwicklung - Neon][TicketNr.: 1071297][[Rollen] - keine Berechtigung vorhanden: Bei Rolle Jeder Tab Berechtigungsüberblick angezeigt, bei allen anderen Rollen ohne Berechtigungsüberblick leer]
parent 1dc6f601
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,6 @@ var res = [];
var roleName = "";
var entityName = "";
let alias = SqlUtils.getSystemAlias();
var roleInternalEveryone = "INTERNAL_EVERYONE";
var entitiesMetaData = project.getDataModels(project.DATAMODEL_KIND_ENTITY);
var entitiesUsePermFlagSet = []; // array, which contains ids of entities with usePermission flag set
......@@ -27,24 +26,11 @@ var rolesOrEntities = [];
if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
roleName = vars.getString("$param.RoleName_param");
if (roleName == roleInternalEveryone) {
var counter = 0;
for each (let entityUsePermFlagSet in entitiesUsePermFlagSet) {
if (PermissionUtil.getNumberOfPermissions(entityUsePermFlagSet, roleName) == 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"]);
}
}
}
rolesOrEntitiesSelect.select("distinct ASYS_PERMISSIONSET.ENTITY_ID")
.from("ASYS_PERMISSIONSET")
.and("ASYS_PERMISSIONSET.ROLE_ID", roleName);
} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
entityName = vars.getString("$param.EntityId_param");
if (PermissionUtil.getNumberOfPermissions(entityName, 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"]);
}
rolesOrEntitiesSelect.select("distinct ASYS_PERMISSIONSET.ROLE_ID")
.from("ASYS_PERMISSIONSET")
.and("ASYS_PERMISSIONSET.ENTITY_ID", entityName);
......@@ -71,11 +57,11 @@ for each (var entry in rolesOrEntities) { // entry contains either a role or an
if (entityPermSetId)
{
recordPermSetId = new SqlBuilder(alias)
.select("ASYS_PERMISSIONSETID")
.from("ASYS_PERMISSIONSET")
.where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSET_ID", entityPermSetId)
.and("ASYS_PERMISSIONSET.ACCESSTYPE", "R")
.arrayColumn();
.select("ASYS_PERMISSIONSETID")
.from("ASYS_PERMISSIONSET")
.where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSET_ID", entityPermSetId)
.and("ASYS_PERMISSIONSET.ACCESSTYPE", "R")
.arrayColumn();
currOverview = [entityPermSetId, entry, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment