From 9f4c9c0dc777f36bceea7a0c864a1df3497b6300 Mon Sep 17 00:00:00 2001
From: Simon Leipold <s.leipold@adito.de>
Date: Mon, 22 Jun 2020 19:41:14 +0200
Subject: [PATCH] Permissions - fixed validation when changing conditions but
not changing actions
---
.../entityfields/permissionactions/onValidation.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js b/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js
index 98e5767b30c..d6e0383c0fa 100644
--- a/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js
+++ b/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js
@@ -21,6 +21,7 @@ var actionsInDb = PermissionUtil.getActions([permId]);
var actionsAsStringArray = vars.get("$field.ACTION").split(","); // only useful while working with already existing permissions
var emptyCond = PermissionUtil.getEmptyCondString(entityName);
var isDefaultPermission = (permCondInput != emptyCond && permCondInput != "") ? false : true;
+var hasCondChanged = PermissionUtil.isDiff(permId, permCondInput, "COND", "ASYS_PERMISSION");
var deletedRows = vars.get("$field.PermissionActions.deletedRows");
var changedRows = vars.get("$field.PermissionActions.changedRows");
@@ -35,8 +36,8 @@ if (fullPermissions == 0 || fullPermissions == "") {
}
if (
- (deletedRows.length == actionsAsStringArray.length && changedRows.length == 0 && insertedRows.length == 0)
- || (deletedRows.length == 0 && changedRows.length == 0 && insertedRows.length == 0)
+ ((deletedRows.length == actionsAsStringArray.length && changedRows.length == 0 && insertedRows.length == 0)
+ || (deletedRows.length == 0 && changedRows.length == 0 && insertedRows.length == 0)) && !hasCondChanged
) {
result.string(translate.text("Permissions without actions are invalid!"));
}
--
GitLab