Skip to content
Snippets Groups Projects
Commit 8060fa2f authored by Mohamed Mansour's avatar Mohamed Mansour
Browse files

merged origin/master into ActivityThemes

parents 97202199 1306bf7c
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,9 @@ var actionTitle = vars.get("$field.ACTION");
var permissionId = vars.get("$param.PermissionId_param");
var permCondInput = vars.get("$param.PermissionCondition_param");
if (PermissionUtil.existsPermission(permissionId)) {
if (actionTitle == "null" || actionTitle == undefined || actionTitle == null || actionTitle == "") {
result.string(translate.text("Empty actions are not allowed!"));
} else if (PermissionUtil.existsPermission(permissionId)) {
// existing permission
// check if action is already in DB
var actionsInDb = PermissionUtil.getPermissionAction(permissionId);
......@@ -23,4 +25,6 @@ if (PermissionUtil.existsPermission(permissionId)) {
break;
}
}
} else {
result.string(true);
}
\ No newline at end of file
......@@ -9,6 +9,7 @@ var roleTitle = "";
var entityTitle = "";
var sqlCond = "";
var sqlStr = "";
var roleInternalEveryone = "INTERNAL_EVERYONE";
var entitiesMetaData = project.getDataModels(project.DATAMODEL_KIND_ENTITY);
var entitiesUsePermFlagSet = []; // array, which contains ids of entities with usePermission flag set
......@@ -17,6 +18,11 @@ var entitiesUsePermFlagSet = []; // array, which contains ids of entities with u
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.insertNewPermissionSet("", entityMetaData[0], roleInternalEveryone, "", "E");
PermissionUtil.insertNewPermission(noAccessPermissionSetIdEntity, "", "false"); // false is an indicator for PermissionDetails so the user can create a new PermissionSet on access level "E"
}
}
}
......
......@@ -28,7 +28,7 @@ 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
// 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.insertNewPermissionSet("", entityMetaData[0], roleInternalEveryone, "", "E");
PermissionUtil.insertNewPermission(noAccessPermissionSetIdEntity, "", "false"); // false is an indicator for PermissionDetails so the user can create a new PermissionSet on access level "E"
}
......
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