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

1036804 Berechtigung - Entitätsübersicht - updated db-structure and bug fixes

parent 45455d4e
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@
<cardViewTemplate>
<name>Card</name>
<iconField>#ICON</iconField>
<titleField>#TITLE</titleField>
<titleField>#CONTENTTITLE</titleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
......
......@@ -10,6 +10,8 @@ import("Sql_lib");
*/
function PermissionUtil () {}
var alias = "_____SYSTEMALIAS";
/**
* Returns the ids of all subordinated permission sets of a given parent permission set.
*
......@@ -20,9 +22,9 @@ function PermissionUtil () {}
PermissionUtil.getAllChildPermissionSets = function (pPermissionSetId)
{
return db.array(db.COLUMN, SqlCondition.begin()
.and("AB_PERMISSIONSET_ID = '" + pPermissionSetId + "'")
.buildSql("select AB_PERMISSIONSETID from AB_PERMISSIONSET")
);
.and("ASYS_PERMISSIONSET_ID = '" + pPermissionSetId + "'")
.buildSql("select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET")
, alias);
}
/**
......@@ -35,10 +37,10 @@ PermissionUtil.getAllChildPermissionSets = function (pPermissionSetId)
PermissionUtil.getChildRecordPermissionSet = function (pPermissionSetId)
{
return db.array(db.COLUMN, SqlCondition.begin()
.and("AB_PERMISSIONSET_ID = '" + pPermissionSetId + "'")
.and("ASYS_PERMISSIONSET_ID = '" + pPermissionSetId + "'")
.and("ACCESSTYPE = 'R'")
.buildSql("select AB_PERMISSIONSETID from AB_PERMISSIONSET")
);
.buildSql("select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET")
, alias);
}
/**
......@@ -51,10 +53,10 @@ PermissionUtil.getChildRecordPermissionSet = function (pPermissionSetId)
PermissionUtil.getAllChildPermissions = function (pPermissionSetId)
{
return db.array(db.COLUMN, SqlCondition.begin()
.and("AB_PERMISSIONSET.AB_PERMISSIONSETID = '" + pPermissionSetId + "'")
.buildSql("select AB_PERMISSION.AB_PERMISSIONID from AB_PERMISSION"
+ " join AB_PERMISSIONSET on AB_PERMISSIONSET.AB_PERMISSIONSETID = AB_PERMISSION.AB_PERMISSIONSET_ID")
);
.and("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID = '" + pPermissionSetId + "'")
.buildSql("select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSION"
+ " join ASYS_PERMISSIONSET on ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID = ASYS_PERMISSION.ASYS_PERMISSIONSET_ID")
, alias);
}
/**
......@@ -67,10 +69,10 @@ PermissionUtil.getAllChildPermissions = function (pPermissionSetId)
PermissionUtil.getAllChildPermissionActions = function (pPermissionSetId)
{
return db.array(db.COLUMN, SqlCondition.begin()
.and("AB_PERMISSION.AB_PERMISSIONSET_ID = '" + pPermissionSetId + "'")
.buildSql("select AB_PERMISSIONACTION.AB_PERMISSIONACTIONID from AB_PERMISSIONACTION"
+ " join AB_PERMISSION on AB_PERMISSION.AB_PERMISSIONID = AB_PERMISSIONACTION.AB_PERMISSION_ID")
);
.and("ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = '" + pPermissionSetId + "'")
.buildSql("select ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION"
+ " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONID = ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID")
, alias);
}
/**
......@@ -83,9 +85,9 @@ PermissionUtil.getAllChildPermissionActions = function (pPermissionSetId)
PermissionUtil.getAllChildPermissionActions = function (pPermissionId)
{
return db.array(db.COLUMN, SqlCondition.begin()
.and("AB_PERMISSION_ID = '" + pPermissionId + "'")
.buildSql("select AB_PERMISSIONACTIONID from AB_PERMISSIONACTION")
);
.and("ASYS_PERMISSION_ID = '" + pPermissionId + "'")
.buildSql("select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION")
, alias);
}
/**
......@@ -98,9 +100,9 @@ PermissionUtil.getAllChildPermissionActions = function (pPermissionId)
PermissionUtil.resolvePermissionActionId = function (pPermissionActionId)
{
return db.cell(SqlCondition.begin()
.and("AB_PERMISSIONACTIONID = '" + pPermissionActionId + "'")
.buildSql("select AB_PERMISSIONACTION.ACTION from AB_PERMISSIONACTION")
);
.and("ASYS_PERMISSIONACTIONID = '" + pPermissionActionId + "'")
.buildSql("select ASYS_PERMISSIONACTION.ACTION from ASYS_PERMISSIONACTION")
, alias);
}
/**
......@@ -154,8 +156,8 @@ PermissionUtil.indexOfPermId = function(pPermTable, pPermId) {
* @result {String[]} returns the different elements
*/
PermissionUtil.getActionDiff = function(pPermId, pActionNew) {
var sqlStr = "select ACTION from AB_PERMISSIONACTION where AB_PERMISSION_ID = '" + pPermId + "'";
var actionOld = db.array(db.COLUMN, sqlStr);
var sqlStr = "select ACTION from ASYS_PERMISSIONACTION where ASYS_PERMISSION_ID = '" + pPermId + "'";
var actionOld = db.array(db.COLUMN, sqlStr, alias);
return arrDiff(actionOld, pActionNew);
}
......@@ -175,7 +177,7 @@ PermissionUtil.getActionDiff = function(pPermId, pActionNew) {
*/
PermissionUtil.isDiff = function(pId, pString, pDbCol, pDbTable) {
var sqlStr = "select " + pDbCol + " from " + pDbTable + " where " + pDbTable + "ID = '" + pId + "'";
var stringDb = db.cell(sqlStr);
var stringDb = db.cell(sqlStr, alias);
return stringDb != pString ? true : false;
}
......@@ -197,7 +199,7 @@ PermissionUtil.updateIfDiff = function(pId, pValue, pDbCol, pDbTable) {
var cols = [pDbCol];
var vals = [pValue];
var cond = SqlCondition.begin().and(pDbTable + "ID = '" + pId + "'").build();
return db.updateData(pDbTable, cols, null, vals, cond);
return db.updateData(pDbTable, cols, null, vals, cond, alias);
}
return 0;
}
......@@ -210,16 +212,16 @@ PermissionUtil.updateIfDiff = function(pId, pValue, pDbCol, pDbTable) {
* @result {String} returns the id of the default permission of the root permission set
*/
PermissionUtil.getRootPermission = function(pPermId) {
var sqlStr = "select AB_PERMISSIONSET_ID from AB_PERMISSION where AB_PERMISSIONID = '" + pPermId + "'";
var parentPermSet = db.array(db.ROW, sqlStr);
var sqlStr = "select ASYS_PERMISSIONSET_ID from ASYS_PERMISSION where ASYS_PERMISSIONID = '" + pPermId + "'";
var parentPermSet = db.array(db.ROW, sqlStr, alias);
while (parentPermSet[0] != "") {
sqlStr = "select AB_PERMISSIONSET_ID, AB_PERMISSIONSETID from AB_PERMISSIONSET where AB_PERMISSIONSETID = '" + parentPermSet[0] + "'";
parentPermSet = db.array(db.ROW, sqlStr);
sqlStr = "select ASYS_PERMISSIONSET_ID, ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET where ASYS_PERMISSIONSETID = '" + parentPermSet[0] + "'";
parentPermSet = db.array(db.ROW, sqlStr, alias);
}
sqlStr = "select AB_PERMISSIONID from AB_PERMISSION where AB_PERMISSIONSET_ID = '" + parentPermSet[1] + "'";
return db.cell(sqlStr);
sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION where ASYS_PERMISSIONSET_ID = '" + parentPermSet[1] + "'";
return db.cell(sqlStr, alias);
}
/**
......@@ -230,11 +232,11 @@ PermissionUtil.getRootPermission = function(pPermId) {
* @result {String} returns the id of the default field permission of the root field permission set
*/
PermissionUtil.getRootFieldPermission = function(pPermId) {
var sqlStr = "select AB_PERMISSIONSET_ID from AB_PERMISSION where AB_PERMISSIONID = '" + pPermId + "'";
var parentFieldPermSet = db.array(db.ROW, sqlStr);
var sqlStr = "select ASYS_PERMISSIONSET_ID from ASYS_PERMISSION where ASYS_PERMISSIONID = '" + pPermId + "'";
var parentFieldPermSet = db.array(db.ROW, sqlStr, alias);
sqlStr = "select AB_PERMISSIONID from AB_PERMISSION where AB_PERMISSIONSET_ID = '" + parentFieldPermSet + "' and cond is null";
return db.cell(sqlStr);
sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION where ASYS_PERMISSIONSET_ID = '" + parentFieldPermSet + "' and cond is null";
return db.cell(sqlStr, alias);
}
/**
......@@ -245,10 +247,10 @@ PermissionUtil.getRootFieldPermission = function(pPermId) {
* @result {String} returns the id of the default permission of a given permission set
*/
PermissionUtil.getDefaultPermission = function(pPermSetId) {
var sqlStr = "select AB_PERMISSIONID from AB_PERMISSION"
+ " where AB_PERMISSIONSET_ID = '" + pPermSetId + "'"
var sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION"
+ " where ASYS_PERMISSIONSET_ID = '" + pPermSetId + "'"
+ " and COND is null"
return db.cell(sqlStr);
return db.cell(sqlStr, alias);
}
/**
......@@ -259,10 +261,10 @@ PermissionUtil.getDefaultPermission = function(pPermSetId) {
* @result {String[]} returns the ids of the conditional permissions of a given permission set
*/
PermissionUtil.getConditionalPermission = function(pPermSetId) {
var sqlStr = "select AB_PERMISSIONID from AB_PERMISSION"
+ " where AB_PERMISSIONSET_ID = '" + pPermSetId + "'"
var sqlStr = "select ASYS_PERMISSIONID from ASYS_PERMISSION"
+ " where ASYS_PERMISSIONSET_ID = '" + pPermSetId + "'"
+ " and COND is not null"
return db.table(sqlStr);
return db.table(sqlStr, alias);
}
/**
......@@ -273,9 +275,9 @@ PermissionUtil.getConditionalPermission = function(pPermSetId) {
* @result {String[]} returns the ids of linked actions of a given permission
*/
PermissionUtil.getPermissionAction = function(pPermId) {
var sqlStr = "select AB_PERMISSIONACTIONID from AB_PERMISSIONACTION"
+ " where AB_PERMISSION_ID = '" + pPermId + "'"
return db.table(sqlStr);
var sqlStr = "select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION"
+ " where ASYS_PERMISSION_ID = '" + pPermId + "'"
return db.table(sqlStr, alias);
}
/**
......@@ -288,9 +290,9 @@ PermissionUtil.getPermissionAction = function(pPermId) {
* @result {String} returns the id of the root permission set of the given entity-role-combination
*/
PermissionUtil.getRootPermissionSet = function(pRole, pEntity) {
var sqlStr = "select AB_PERMISSIONSETID from AB_PERMISSIONSET"
var sqlStr = "select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET"
+ " where ROLE_ID = '" + pRole + "' and ENTITY_ID = '" + pEntity +"' and ACCESSTYPE = 'E'";
return db.cell(sqlStr);
return db.cell(sqlStr, alias);
}
/**
......@@ -301,9 +303,9 @@ PermissionUtil.getRootPermissionSet = function(pRole, pEntity) {
* @result {String} returns the id of the parent permission set of the given permission
*/
PermissionUtil.getParentPermissionSet = function(pPermId) {
var sqlStr = "select AB_PERMISSIONSET_ID from AB_PERMISSION"
+ " where AB_PERMISSIONID = '" + pPermId + "'";
return db.cell(sqlStr);
var sqlStr = "select ASYS_PERMISSIONSET_ID from ASYS_PERMISSION"
+ " where ASYS_PERMISSIONID = '" + pPermId + "'";
return db.cell(sqlStr, alias);
}
/**
......@@ -331,7 +333,7 @@ PermissionUtil.permSetIsEmpty = function(pPermSetId) {
* @result {String[]} returns ids of all permissions
*/
PermissionUtil.getAllPermissions = function(pPermSetIds) {
return db.table("select AB_PERMISSIONID from AB_PERMISSION where AB_PERMISSION.AB_PERMISSIONSET_ID in ('" + pPermSetIds.join("','") + "')");
return db.table("select ASYS_PERMISSIONID from ASYS_PERMISSION where ASYS_PERMISSION.ASYS_PERMISSIONSET_ID in ('" + pPermSetIds.join("','") + "')", alias);
}
/**
......@@ -342,7 +344,7 @@ PermissionUtil.getAllPermissions = function(pPermSetIds) {
* @result {String[]} returns ids of all permission actions
*/
PermissionUtil.getAllPermissionActions = function(pPermIds) {
return db.table("select AB_PERMISSIONACTIONID from AB_PERMISSIONACTION where AB_PERMISSIONACTION.AB_PERMISSION_ID in ('" + pPermIds.join("','") + "')");
return db.table("select ASYS_PERMISSIONACTIONID from ASYS_PERMISSIONACTION where ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID in ('" + pPermIds.join("','") + "')", alias);
}
/**
......@@ -353,7 +355,7 @@ PermissionUtil.getAllPermissionActions = function(pPermIds) {
* @result {String} returns the value of condition type (true or false)
*/
PermissionUtil.getPermissionCondType = function(pPermId) {
return db.cell("select CONDTYPE from AB_PERMISSION where AB_PERMISSION.AB_PERMISSIONID = '" + pPermId + "'");
return db.cell("select CONDTYPE from ASYS_PERMISSION where ASYS_PERMISSION.ASYS_PERMISSIONID = '" + pPermId + "'", alias);
}
/**
......@@ -366,8 +368,8 @@ PermissionUtil.getPermissionCondType = function(pPermId) {
* @result {String[]} returns the element which is a duplicate, otherwise null
*/
PermissionUtil.containsDuplicateActions = function(pPermId, pActionNew) {
var sqlStr = "select ACTION from AB_PERMISSIONACTION where AB_PERMISSION_ID = '" + pPermId + "'";
var actionsOld = db.array(db.COLUMN, sqlStr);
var sqlStr = "select ACTION from ASYS_PERMISSIONACTION where ASYS_PERMISSION_ID = '" + pPermId + "'";
var actionsOld = db.array(db.COLUMN, sqlStr, alias);
var actionsNew = pActionNew.split(",");
var res = null
......@@ -379,7 +381,7 @@ PermissionUtil.containsDuplicateActions = function(pPermId, pActionNew) {
}
/**
* Inserts a new instance of a permission set into AB_PERMISSIONSET.
* Inserts a new instance of a permission set into ASYS_PERMISSIONSET.
*
* @param {String} pParentPermSet The parent permission set, empty if root node
*
......@@ -394,16 +396,16 @@ PermissionUtil.containsDuplicateActions = function(pPermId, pActionNew) {
* @result {Integer} returns the id of the inserted permission set
*/
PermissionUtil.insertNewPermissionSet = function(pParentPermSet, pEntity, pRole, pField, pAccessType) {
var table = "AB_PERMISSIONSET";
var table = "ASYS_PERMISSIONSET";
var cols = db.getColumns(table);
var permsetid = util.getNewUUID();
var vals = [permsetid, pParentPermSet, pAccessType, pEntity, pField, pRole];
db.insertData(table, cols, null, vals);
var vals = [pAccessType, permsetid, pParentPermSet, pEntity, pField, pRole];
db.insertData(table, cols, null, vals, alias);
return permsetid;
}
/**
* Inserts a new instance of a permission into AB_PERMISSION.
* Inserts a new instance of a permission into ASYS_PERMISSION.
*
* @param {String} pParentPermSet The parent permission set
*
......@@ -414,16 +416,16 @@ PermissionUtil.insertNewPermissionSet = function(pParentPermSet, pEntity, pRole,
* @result {Integer} returns the id of the inserted permission
*/
PermissionUtil.insertNewPermission = function(pParentPermSet, pCond, pCondType) {
var table = "AB_PERMISSION";
var table = "ASYS_PERMISSION";
var cols = db.getColumns(table);
var permid = util.getNewUUID();
var vals = [permid, pParentPermSet, pCond, pCondType];
db.insertData(table, cols, null, vals);
db.insertData(table, cols, null, vals, alias);
return permid;
}
/**
* Inserts a new instance of a permission action into AB_PERMISSIONACTION.
* Inserts a new instance of a permission action into ASYS_PERMISSIONACTION.
*
* @param {String} pParentPerm The parent permission
*
......@@ -432,11 +434,11 @@ PermissionUtil.insertNewPermission = function(pParentPermSet, pCond, pCondType)
* @result {Integer} returns the id of the inserted permission action
*/
PermissionUtil.insertNewPermissionAction = function(pParentPerm, pAction) {
var table = "AB_PERMISSIONACTION";
var table = "ASYS_PERMISSIONACTION";
var cols = db.getColumns(table);
var permactionid = util.getNewUUID();
var vals = [permactionid, pParentPerm, pAction];
db.insertData(table, cols, null, vals);
var vals = [pAction, permactionid, pParentPerm];
db.insertData(table, cols, null, vals, alias);
return permactionid;
}
......
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