Skip to content
Snippets Groups Projects
Commit b222c192 authored by Simon Leipold's avatar Simon Leipold
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1048382][Permission - Refactoring]

parent 70c19550
No related branches found
No related tags found
No related merge requests found
import("system.logging");
import("Sql_lib"); import("Sql_lib");
import("system.project"); import("system.project");
import("system.vars"); import("system.vars");
...@@ -94,6 +95,9 @@ result.object(res); ...@@ -94,6 +95,9 @@ result.object(res);
function prepareOverview(pPermSetId, pCurrOverview, pMode) { function prepareOverview(pPermSetId, pCurrOverview, pMode) {
var conditionalPermActionId = [], currOverview; var conditionalPermActionId = [], currOverview;
if (pPermSetId == "") {
return pCurrOverview;
}
switch (pMode) { switch (pMode) {
case "default": case "default":
var permId = PermissionUtil.getPermissionWithoutCond(pPermSetId); var permId = PermissionUtil.getPermissionWithoutCond(pPermSetId);
......
...@@ -249,7 +249,7 @@ function PermissionUtil () {} ...@@ -249,7 +249,7 @@ function PermissionUtil () {}
return newSelect("ENTITY_ID", alias) return newSelect("ENTITY_ID", alias)
.from("ASYS_PERMISSIONSET") .from("ASYS_PERMISSIONSET")
.whereIfSet("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId) .whereIfSet("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", pSetId)
.cell(true, ""); .cell();
} }
/** /**
...@@ -287,7 +287,7 @@ function PermissionUtil () {} ...@@ -287,7 +287,7 @@ function PermissionUtil () {}
.whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetId) .whereIfSet("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID", pSetId)
.and(new SqlBuilder(alias).where() .and(new SqlBuilder(alias).where()
.or("COND is not null") .or("COND is not null")
.or("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?") .and("ASYS_PERMISSION.COND", emptyCond, sqlHelper.castLob("#", 254) +" != ?")
) )
.arrayColumn(); .arrayColumn();
} }
......
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