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

.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml

 <?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

.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml

 <?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

.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml

 <?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

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>

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

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>

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")));

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());

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

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
 }

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);

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");

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>

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>

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);

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>

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>

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

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>

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" />