From c52278244b4c7ec7e439c246ea8fb26918ea9bf8 Mon Sep 17 00:00:00 2001
From: Simon Leipold <s.leipold@adito.de>
Date: Wed, 19 Feb 2020 15:05:58 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1048382][Permission
- Refactoring]
---
.../recordcontainers/jdito/contentProcess.js | 4 ++++
process/Permission_lib/process.js | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index 4e241b5186..b5e82bed16 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("Sql_lib");
import("system.project");
import("system.vars");
@@ -94,6 +95,9 @@ result.object(res);
function prepareOverview(pPermSetId, pCurrOverview, pMode) {
var conditionalPermActionId = [], currOverview;
+ if (pPermSetId == "") {
+ return pCurrOverview;
+ }
switch (pMode) {
case "default":
var permId = PermissionUtil.getPermissionWithoutCond(pPermSetId);
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index cff2ffa185..2362b10b23 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -249,7 +249,7 @@ function PermissionUtil () {}
return newSelect("ENTITY_ID", alias)
.from("ASYS_PERMISSIONSET")
.whereIfSet("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId)
- .cell(true, "");
+ .cell();
}
/**
@@ -287,7 +287,7 @@ function PermissionUtil () {}
.whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetId)
.and(new SqlBuilder(alias).where()
.or("COND is not null")
- .or("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?")
+ .and("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?")
)
.arrayColumn();
}
--
GitLab