From 652c6181475b0c61691cf8f91de75f93c0fdf8b2 Mon Sep 17 00:00:00 2001
From: Simon Leipold <s.leipold@adito.de>
Date: Tue, 21 May 2019 13:57:17 +0200
Subject: [PATCH] =?UTF-8?q?1036804=20Berechtigung=20-=20Entit=C3=A4ts?=
=?UTF-8?q?=C3=BCbersicht=20-=20updated=20db-structure=20and=20bug=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basic/2019.2/create_asys_permission.xml | 20 +--
.../2019.2/create_asys_permissionaction.xml | 18 +--
.../2019.2/create_asys_permissionset.xml | 24 ++--
.../PermissionAction_entity.aod | 8 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../PermissionDetail_entity.aod | 5 +
.../condtype/displayValueProcess.js | 2 +-
.../containername_param/valueProcess.js | 2 +-
.../recordcontainers/jdito/contentProcess.js | 17 +--
.../recordcontainers/jdito/onDelete.js | 24 ++--
.../recordcontainers/jdito/onInsert.js | 15 +-
.../recordcontainers/jdito/onUpdate.js | 13 +-
.../PermissionMetaData_entity.aod | 3 +-
.../PermissionOverview_entity.aod | 2 +-
.../recordcontainers/jdito/contentProcess.js | 4 +-
.../PermissionSet_entity.aod | 8 +-
.../Permission_entity/Permission_entity.aod | 8 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Role_entity/Role_entity.aod | 3 +-
.../PermissionDetailFilter_view.aod | 2 +-
.../PermissionDetailPreview_view.aod | 2 +-
process/Permission_lib/process.js | 130 +++++++++---------
22 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
index 1a6bc58ae9e..66b4bfee09b 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
@@ -1,13 +1,13 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="s.leipold" id="10e8ed3e-7f75-400b-bc21-6fc3db778296">
- <createTable tableName="ASYS_PERMISSION">
- <column name="PERMISSIONID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSION_ID"/>
- </column>
- <column name="PERMISSIONSET_ID" type="CHAR(36)"/>
- <column name="COND" type="VARCHAR(255)"/>
- <column name="CONDTYPE" type="BOOLEAN"/>
- </createTable>
-</changeSet>
+ <changeSet author="s.leipold" id="746f6e0c-3eab-4424-867f-4cf4fb4c45bb">
+ <createTable tableName="ASYS_PERMISSION">
+ <column name="ASYS_PERMISSIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSION_ID"/>
+ </column>
+ <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
+ <column name="COND" type="VARCHAR(255)"/>
+ <column name="CONDTYPE" type="BOOLEAN"/>
+ </createTable>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
index c29101211b2..746ab274026 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
@@ -1,12 +1,12 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="s.leipold" id="7ba7c5f3-2b2b-4161-aa2b-dad3b8df6a57">
- <createTable tableName="ASYS_PERMISSIONACTION">
- <column name="PERMISSIONACTIONID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONACTION_ID"/>
- </column>
- <column name="PERMISSION_ID" type="CHAR(36)"/>
- <column name="ACTION" type="VARCHAR(255)"/>
- </createTable>
-</changeSet>
+ <changeSet author="s.leipold" id="20241de4-091e-4093-8055-c87c172e5788">
+ <createTable tableName="ASYS_PERMISSIONACTION">
+ <column name="ASYS_PERMISSIONACTIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONACTION_ID"/>
+ </column>
+ <column name="ASYS_PERMISSION_ID" type="CHAR(36)"/>
+ <column name="ACTION" type="VARCHAR(255)"/>
+ </createTable>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
index dcc8faad2f9..31583db7ce1 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
@@ -1,15 +1,15 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="s.leipold" id="8a84a4ad-8e29-4bef-b851-980a23a8c58c">
- <createTable tableName="ASYS_PERMISSIONSET">
- <column name="PERMISSIONSETID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONSET_ID"/>
- </column>
- <column name="PERMISSIONSET_ID" type="CHAR(36)"/>
- <column name="ENTITY_ID" type="VARCHAR(255)"/>
- <column name="ROLE_ID" type="VARCHAR(255)"/>
- <column name="FIELD_ID" type="VARCHAR(255)"/>
- <column name="ACCESSTYPE" type="CHAR(1)"/>
- </createTable>
-</changeSet>
+ <changeSet author="s.leipold" id="8a125d57-48c6-4d2e-9568-d5e66f72a702">
+ <createTable tableName="ASYS_PERMISSIONSET">
+ <column name="ASYS_PERMISSIONSETID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONSET_ID"/>
+ </column>
+ <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
+ <column name="ENTITY_ID" type="VARCHAR(255)"/>
+ <column name="ROLE_ID" type="VARCHAR(255)"/>
+ <column name="FIELD_ID" type="VARCHAR(255)"/>
+ <column name="ACCESSTYPE" type="CHAR(1)"/>
+ </createTable>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index 07521d06a95..4ab37a7f094 100644
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
@@ -53,13 +53,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
+ <alias>_____SYSTEMALIAS</alias>
<conditionProcess>%aditoprj%/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
- <name>164b4d98-4458-40ed-8fa9-f29aef333372</name>
- <tableName>AB_PERMISSIONACTION</tableName>
- <primaryKey>AB_PERMISSIONACTIONID</primaryKey>
+ <name>f73c027f-55f0-4f43-8520-8bd7b4bcbf81</name>
+ <tableName>ASYS_PERMISSIONACTION</tableName>
+ <primaryKey>PERMISSIONACTIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
diff --git a/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js b/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js
index d858d1cb48b..10aaf65ee4b 100644
--- a/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/PermissionAction_entity/recordcontainers/db/conditionProcess.js
@@ -3,4 +3,4 @@ import("system.db");
import("system.result");
if (vars.get("$param.PermissionId_param"))
- result.string(db.translateCondition("AB_PERMISSION_ID = '" + vars.get("$param.PermissionId_param") + "'"));
\ No newline at end of file
+ result.string(db.translateCondition("ASYS_PERMISSION_ID = '" + vars.get("$param.PermissionId_param") + "'"));
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 0691776bc29..f0a82c5aa6b 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -17,6 +17,7 @@
<entityField>
<name>ACTION</name>
<title>Action</title>
+ <mandatory v="true" />
<searchable v="false" />
</entityField>
<entityField>
@@ -24,6 +25,7 @@
<title>Role</title>
<consumer>Roles</consumer>
<linkedContext>Role</linkedContext>
+ <mandatory v="true" />
<groupable v="true" />
<valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess>
</entityField>
@@ -32,6 +34,7 @@
<title>Entity</title>
<consumer>MetaData</consumer>
<linkedContext>PermissionMetaData</linkedContext>
+ <mandatory v="true" />
<groupable v="true" />
<valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess>
</entityField>
@@ -51,12 +54,14 @@
<name>ACCESSTYPE</name>
<title>Access type</title>
<consumer>KeywordAccessType</consumer>
+ <mandatory v="true" />
<groupable v="true" />
</entityField>
<entityField>
<name>CONDTYPE</name>
<title>Condition Type</title>
<consumer>KeywordConditionType</consumer>
+ <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
index 8d0ed5002ab..40f4ec0027f 100644
--- a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-//result.string(KeywordUtils.getViewValue($KeywordRegistry.permissionConditionType(), vars.get("$field.CONDTYPE")));
+result.string(KeywordUtils.getViewValue($KeywordRegistry.permissionCondType(), vars.get("$field.CONDTYPE")));
diff --git a/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js b/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js
index 206253174b1..2f9426da9a4 100644
--- a/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.permissionConditionType());
+result.string($KeywordRegistry.permissionCondType());
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
index a51aa5d5700..8d45a3c3c78 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
@@ -7,22 +7,23 @@ import("Permission_lib");
var selectedPermission = vars.get("$local.idvalues");
var sqlStr;
var whereCond = "";
+var alias = "_____SYSTEMALIAS";
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
- whereCond = " where AB_PERMISSIONSET.ROLE_ID = '" + vars.getString("$param.RoleTitle_param") + "'";
+ whereCond = " where ASYS_PERMISSIONSET.ROLE_ID = '" + vars.getString("$param.RoleTitle_param") + "'";
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
- whereCond = " where AB_PERMISSIONSET.ENTITY_ID = '" + vars.getString("$param.EntityTitle_param") + "'";
+ whereCond = " where ASYS_PERMISSIONSET.ENTITY_ID = '" + vars.getString("$param.EntityTitle_param") + "'";
}
sqlStr =
- "select AB_PERMISSION.AB_PERMISSIONID, AB_PERMISSIONSET.ENTITY_ID, AB_PERMISSIONSET.ROLE_ID,"
- + " AB_PERMISSIONSET.FIELD_ID, AB_PERMISSION.COND, AB_PERMISSIONACTION.ACTION, AB_PERMISSIONSET.ACCESSTYPE, AB_PERMISSION.CONDTYPE from AB_PERMISSIONSET"
- + " join AB_PERMISSION on AB_PERMISSION.AB_PERMISSIONSET_ID = AB_PERMISSIONSET.AB_PERMISSIONSETID"
- + " join AB_PERMISSIONACTION on AB_PERMISSIONACTION.AB_PERMISSION_ID = AB_PERMISSION.AB_PERMISSIONID"
+ "select ASYS_PERMISSION.ASYS_PERMISSIONID, ASYS_PERMISSIONSET.ENTITY_ID, ASYS_PERMISSIONSET.ROLE_ID,"
+ + " ASYS_PERMISSIONSET.FIELD_ID, ASYS_PERMISSION.COND, ASYS_PERMISSIONACTION.ACTION, ASYS_PERMISSIONSET.ACCESSTYPE, ASYS_PERMISSION.CONDTYPE from ASYS_PERMISSIONSET"
+ + " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID"
+ + " join ASYS_PERMISSIONACTION on ASYS_PERMISSIONACTION.ASYS_PERMISSION_ID = ASYS_PERMISSION.ASYS_PERMISSIONID"
+ whereCond
- + " order by AB_PERMISSION.AB_PERMISSIONID";
+ + " order by ASYS_PERMISSION.ASYS_PERMISSIONID";
-var sqlRes = db.table(sqlStr);
+var sqlRes = db.table(sqlStr, alias);
var permissionTable = PermissionUtil.convertArrToObj(sqlRes);
// group all permissions by permissionid and condition, concat actions
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js
index 59f34513d50..adbb5889dfb 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js
@@ -8,13 +8,13 @@ var parentPermSetId = PermissionUtil.getParentPermissionSet(permId);
var linkedActions = PermissionUtil.getAllChildPermissionActions(permId);
var sqlCondDelAction = SqlCondition.begin()
-.and("AB_PERMISSIONACTION.AB_PERMISSIONACTIONID in ('" + linkedActions.join("','") + "')")
+.and("ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID in ('" + linkedActions.join("','") + "')")
.build();
var sqlCondDelPerm = SqlCondition.begin()
-.and("AB_PERMISSION.AB_PERMISSIONID = '" + permId + "'")
+.and("ASYS_PERMISSION.ASYS_PERMISSIONID = '" + permId + "'")
.build();
var sqlCondDelPermSet = SqlCondition.begin()
-.and("AB_PERMISSIONSET.AB_PERMISSIONSETID = '" + parentPermSetId + "'")
+.and("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID = '" + parentPermSetId + "'")
.build();
switch (accessType) {
@@ -25,25 +25,25 @@ switch (accessType) {
var allPermActions = PermissionUtil.getAllPermissionActions(allPerms);
sqlCondDelAction = SqlCondition.begin()
- .and("AB_PERMISSIONACTION.AB_PERMISSIONACTIONID in ('" + allPermActions.join("','") + "')")
+ .and("ASYS_PERMISSIONACTION.ASYS_PERMISSIONACTIONID in ('" + allPermActions.join("','") + "')")
.build();
sqlCondDelPerm = SqlCondition.begin()
- .and("AB_PERMISSION.AB_PERMISSIONID in ('" + allPerms.join("','") + "')")
+ .and("ASYS_PERMISSION.ASYS_PERMISSIONID in ('" + allPerms.join("','") + "')")
.build();
sqlCondDelPermSet = SqlCondition.begin()
- .and("AB_PERMISSIONSET.AB_PERMISSIONSETID in ('" + allPermSets.join("','") + "')")
+ .and("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID in ('" + allPermSets.join("','") + "')")
.build();
- db.deleteData("AB_PERMISSIONACTION", sqlCondDelAction); // delete all actions
- db.deleteData("AB_PERMISSION", sqlCondDelPerm); // delete all permissions
- db.deleteData("AB_PERMISSIONSET", sqlCondDelPermSet); // delete all permission sets
+ db.deleteData("ASYS_PERMISSIONACTION", sqlCondDelAction); // delete all actions
+ db.deleteData("ASYS_PERMISSION", sqlCondDelPerm); // delete all permissions
+ db.deleteData("ASYS_PERMISSIONSET", sqlCondDelPermSet); // delete all permission sets
break;
default:
- db.deleteData("AB_PERMISSIONACTION", sqlCondDelAction); // delete all actions of the selected permission
- db.deleteData("AB_PERMISSION", sqlCondDelPerm); // delete the selected permission
+ db.deleteData("ASYS_PERMISSIONACTION", sqlCondDelAction); // delete all actions of the selected permission
+ db.deleteData("ASYS_PERMISSION", sqlCondDelPerm); // delete the selected permission
break;
}
if (PermissionUtil.permSetIsEmpty(parentPermSetId)) {
- db.deleteData("AB_PERMISSIONSET", sqlCondDelPermSet); // delete empty permissionset
+ db.deleteData("ASYS_PERMISSIONSET", sqlCondDelPermSet); // delete empty permissionset
}
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
index 72d8888bbd4..09f7f0299b4 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
@@ -5,8 +5,6 @@ import("system.db");
import("system.vars");
import("Permission_lib");
-logging.log("---INSERT---");
-
var table, cols, vals;
var sqlExt = "";
var permissionid = util.getNewUUID();
@@ -19,9 +17,6 @@ var condition = vars.get("$field.CONDITION");
var action = vars.get("$field.ACTION");
if (checkInput([role, entity, accesstype, condtype, action])) {
- // calculate accesstype
- // TODO: calculation of accesstype not needed
- // $field.ACCESSTYPE should only allow input according to inserted field (->F) or action (view,create) (->E) otherwise (->R)
if (checkInput([field]))
sqlExt += " and FIELD_ID = '" + field + "'";
else if (action.includes("view") || action.includes("create"))
@@ -29,9 +24,9 @@ if (checkInput([role, entity, accesstype, condtype, action])) {
else
sqlExt += " and ACCESSTYPE = 'R'";
- var sqlStr = "select AB_PERMISSIONSETID from AB_PERMISSIONSET where ENTITY_ID = '" + entity + "' and ROLE_ID = '" + role + "'" + sqlExt;
+ var sqlStr = "select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET where ENTITY_ID = '" + entity + "' and ROLE_ID = '" + role + "'" + sqlExt;
var permissionsetid = db.cell(sqlStr);
-
+
if (permissionsetid == "") {
// no fitting permissionset found - insert new permissionset
var rootpermissionset;
@@ -45,7 +40,6 @@ if (checkInput([role, entity, accesstype, condtype, action])) {
// check if a new permissions is needed or an existing one can be used
var existingPermId = permExists(role, entity, field, accesstype, condtype, condition);
- logging.log(existingPermId);
if (existingPermId != "") {
// update
permissionid = existingPermId;
@@ -57,7 +51,6 @@ if (checkInput([role, entity, accesstype, condtype, action])) {
// insert new permissionaction
var actionNew = action.split(",");
- logging.log("action new: " + actionNew.toSource());
for each (let permaction in actionNew) {
PermissionUtil.insertNewPermissionAction(permissionid, permaction);
}
@@ -79,8 +72,8 @@ function permExists(pRole, pEntity, pField, pAccesstype, pCondtype, pCondition)
sqlExt += " and COND = '" + pCondition + "'";
if (pField != null && pField != undefined && pField != "")
sqlExt += " and FIELD_ID = '" + pField + "'";
- var sqlStr = "select AB_PERMISSION.AB_PERMISSIONID from AB_PERMISSIONSET"
- + " join AB_PERMISSION on AB_PERMISSION.AB_PERMISSIONSET_ID = AB_PERMISSIONSET.AB_PERMISSIONSETID"
+ var sqlStr = "select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSIONSET"
+ + " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID"
+ " where ENTITY_ID = '" + pEntity + "' and ROLE_ID = '" + pRole + "'"
+ " and ACCESSTYPE = '" + pAccesstype + "' and CONDTYPE = '" + pCondtype + "'" + sqlExt;
var permId = db.cell(sqlStr);
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js
index 3bf18cf748a..0be080b8021 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js
@@ -4,12 +4,9 @@ import("system.db");
import("system.vars");
import("Permission_lib");
-logging.log("---UPDATE---");
-
var table, cols, vals, cond;
var permissionid = vars.get("$field.UID");
-logging.log("permissionid: " + permissionid);
var actionNew = vars.get("$field.ACTION").split(",");
var entityNew = vars.get("$field.ENTITY");
var permCond = vars.get("$field.CONDITION");
@@ -18,8 +15,8 @@ var diff = PermissionUtil.getActionDiff(permissionid, actionNew);
if (diff.length > 0) {
// delete all linked permission actions
- table = "AB_PERMISSIONACTION";
- cond = SqlCondition.begin().and("AB_PERMISSION_ID = '" + permissionid + "'").build();
+ table = "ASYS_PERMISSIONACTION";
+ cond = SqlCondition.begin().and("ASYS_PERMISSION_ID = '" + permissionid + "'").build();
var dbDeletes = db.deleteData(table, cond);
// insert the different actions
@@ -29,7 +26,7 @@ if (diff.length > 0) {
}
}
-PermissionUtil.updateIfDiff(permissionid, permCond, "COND", "AB_PERMISSION"); // updates COND if the new cond is different to COND in DB
-PermissionUtil.updateIfDiff(permissionid, permCondType, "CONDTYPE", "AB_PERMISSION"); // updates CONDTYPE if the new condtype is different to CONDTYPE in DB
+PermissionUtil.updateIfDiff(permissionid, permCond, "COND", "ASYS_PERMISSION"); // updates COND if the new cond is different to COND in DB
+PermissionUtil.updateIfDiff(permissionid, permCondType, "CONDTYPE", "ASYS_PERMISSION"); // updates CONDTYPE if the new condtype is different to CONDTYPE in DB
// entity of children has to be changed/deleted/ignored?
-// PermissionUtil.updateIfDiff(PermissionUtil.getParentPermissionSet(permissionid), entityNew, "ENTITY_ID", "AB_PERMISSIONSET");
+// PermissionUtil.updateIfDiff(PermissionUtil.getParentPermissionSet(permissionid), entityNew, "ENTITY_ID", "ASYS_PERMISSIONSET");
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index b08bb2b6f9c..afcc9c6047f 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -81,8 +81,9 @@
<recordContainers>
<jDitoRecordContainer>
<name>jDito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<isPageable v="false" />
+ <isFilterable v="true" />
<contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFields>
<element>UID.value</element>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index a3fced035b6..49d95285d5a 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -78,7 +78,7 @@
<recordContainers>
<jDitoRecordContainer>
<name>jDito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFields>
<element>UID.value</element>
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index a9d0a7060ae..577562c79ec 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -12,11 +12,11 @@ var sqlStr = "";
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
roleTitle = vars.getString("$param.RoleTitle_param");
sqlCond = " where ROLE_ID = '" + roleTitle + "'";
- sqlStr = "select distinct ENTITY_ID from AB_PERMISSIONSET" + sqlCond;
+ sqlStr = "select distinct ENTITY_ID from ASYS_PERMISSIONSET" + sqlCond;
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
entityTitle = vars.getString("$param.EntityTitle_param");
sqlCond = " where ENTITY_ID = '" + entityTitle + "'";
- sqlStr = "select distinct ROLE_ID from AB_PERMISSIONSET" + sqlCond;
+ sqlStr = "select distinct ROLE_ID from ASYS_PERMISSIONSET" + sqlCond;
}
var rolesOrEntities = db.array(db.COLUMN, sqlStr);
diff --git a/entity/PermissionSet_entity/PermissionSet_entity.aod b/entity/PermissionSet_entity/PermissionSet_entity.aod
index cd1ac606d77..e248b5b557c 100644
--- a/entity/PermissionSet_entity/PermissionSet_entity.aod
+++ b/entity/PermissionSet_entity/PermissionSet_entity.aod
@@ -66,12 +66,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
+ <alias>_____SYSTEMALIAS</alias>
<linkInformation>
<linkInformation>
- <name>a9991ed6-0f6a-4da3-b54c-0b1a3c9cf885</name>
- <tableName>AB_PERMISSIONSET</tableName>
- <primaryKey>AB_PERMISSIONSETID</primaryKey>
+ <name>85886d1e-c26d-48ac-93fc-ff06c24ba8a3</name>
+ <tableName>ASYS_PERMISSIONSET</tableName>
+ <primaryKey>PERMISSIONSETID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
diff --git a/entity/Permission_entity/Permission_entity.aod b/entity/Permission_entity/Permission_entity.aod
index 4ae5db01e9c..87b91b6d71e 100644
--- a/entity/Permission_entity/Permission_entity.aod
+++ b/entity/Permission_entity/Permission_entity.aod
@@ -66,13 +66,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
+ <alias>_____SYSTEMALIAS</alias>
<conditionProcess>%aditoprj%/entity/Permission_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
- <name>2061cedc-6d6f-4515-9ef8-8af77aba483e</name>
- <tableName>AB_PERMISSION</tableName>
- <primaryKey>AB_PERMISSIONID</primaryKey>
+ <name>a2c1ed85-8827-47dc-ad87-cbed33c141e5</name>
+ <tableName>ASYS_PERMISSION</tableName>
+ <primaryKey>PERMISSIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
diff --git a/entity/Permission_entity/recordcontainers/db/conditionProcess.js b/entity/Permission_entity/recordcontainers/db/conditionProcess.js
index e3b2aadeab4..88f496a9fc2 100644
--- a/entity/Permission_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Permission_entity/recordcontainers/db/conditionProcess.js
@@ -3,4 +3,4 @@ import("system.db");
import("system.result");
if (vars.exists("$param.PermissionSetId_param") && vars.get("$param.PermissionSetId_param"))
- result.string(db.translateCondition("AB_PERMISSIONSET_ID = '" + vars.get("$param.PermissionSetId_param") + "'"));
\ No newline at end of file
+ result.string(db.translateCondition("ASYS_PERMISSIONSET_ID = '" + vars.get("$param.PermissionSetId_param") + "'"));
\ No newline at end of file
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index f67054398e2..7361c7c1eb9 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -76,7 +76,8 @@
<recordContainers>
<jDitoRecordContainer>
<name>jDito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <isFilterable v="true" />
<contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFields>
<element>UID.value</element>
diff --git a/neonView/PermissionDetailFilter_view/PermissionDetailFilter_view.aod b/neonView/PermissionDetailFilter_view/PermissionDetailFilter_view.aod
index 60abad21e7d..427042b353b 100644
--- a/neonView/PermissionDetailFilter_view/PermissionDetailFilter_view.aod
+++ b/neonView/PermissionDetailFilter_view/PermissionDetailFilter_view.aod
@@ -13,7 +13,7 @@
<treeViewTemplate>
<name>Treetable</name>
<parentField>PARENT</parentField>
- <titleField>#TITLE</titleField>
+ <titleField>#CONTENTTITLE</titleField>
<descriptionField>ACTION</descriptionField>
<iconField>#ICON</iconField>
<hideContentSearch v="true" />
diff --git a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
index 68df6946fe0..ca1524850be 100644
--- a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
+++ b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
@@ -11,7 +11,7 @@
<cardViewTemplate>
<name>Card</name>
<iconField>#ICON</iconField>
- <titleField>#TITLE</titleField>
+ <titleField>#CONTENTTITLE</titleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index f449d69f201..247e338f2c5 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -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;
}
--
GitLab