Skip to content
Snippets Groups Projects
Commit f4c775bc authored by S.Leipold's avatar S.Leipold Committed by Simon Leipold
Browse files

Permission param refactor: EntityTitle RoleTitle -> EntityId RoleName 

(cherry picked from commit 48e41ec8)
parent fe1c06b1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 46 deletions
entity/PermissionDetail_entity/PermissionDetail_entity.aod
+ 2
− 2
View file @ f4c775bc
......@@ -110,7 +110,7 @@
</dependencies>
</entityProvider>
<entityParameter>
<name>RoleTitle_param</name>
<name>RoleName_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
......@@ -133,7 +133,7 @@
</dependency>
</entityConsumer>
<entityParameter>
<name>EntityTitle_param</name>
<name>EntityId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
......
entity/PermissionDetail_entity/contentTitleProcess.js
+ 14
− 11
View file @ f4c775bc
......@@ -6,18 +6,21 @@ import("system.result");
var res = "";
var entityName = vars.get("$field.ENTITY");
var roleName = vars.get("$field.ROLE");
var accesstype = vars.get("$field.ACCESSTYPE");
var cond = vars.get("$field.CONDITION");
var emptyCond = PermissionUtil.getEmptyCondString(entityName);
switch (vars.get("$field.ACCESSTYPE")) {
switch (accesstype) {
case "E":
if (vars.get("$param.RoleTitle_param") && vars.get("$field.ENTITY") != "") {
res += vars.get("$field.ENTITY");
} else if (vars.get("$param.EntityTitle_param") && vars.get("$field.ROLE") != "") {
res += vars.get("$field.ROLE");
} else if (vars.get("$field.ROLE") != "") {
res += vars.get("$field.ROLE");
} else if (vars.get("$field.ENTITY") != "") {
res += vars.get("$field.ENTITY");
if (vars.get("$param.RoleName_param") && entityName != "") {
res += entityName;
} else if (vars.get("$param.EntityId_param") && roleName != "") {
res += roleName;
} else if (roleName != "") {
res += roleName;
} else if (entityName != "") {
res += entityName;
}
break;
case "R":
......@@ -31,8 +34,8 @@ switch (vars.get("$field.ACCESSTYPE")) {
break;
}
if (vars.get("$field.ACCESSTYPE") != "E") {
if (vars.get("$field.CONDITION") != emptyCond && vars.get("$field.CONDITION") != "") {
if (accesstype != "E") {
if (cond != emptyCond && cond != "") {
res += " - conditional";
} else {
res += " - default";
......
entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js
+ 2
− 2
View file @ f4c775bc
......@@ -5,8 +5,8 @@ import("system.neon");
var recordstate = vars.get("$sys.recordstate");
var entity = "";
if(vars.exists("$param.EntityTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
entity = vars.get("$param.EntityTitle_param");
if(vars.exists("$param.EntityId_param") && recordstate == neon.OPERATINGSTATE_NEW) {
entity = vars.get("$param.EntityId_param");
} else {
entity = vars.get("$field.ENTITY");
}
......
entity/PermissionDetail_entity/entityfields/entity/stateProcess.js
+ 1
− 1
View file @ f4c775bc
......@@ -2,7 +2,7 @@ import("system.result");
import("system.vars");
import("system.neon");
var entityTitle = vars.get("$param.EntityTitle_param");
var entityTitle = vars.get("$param.EntityId_param");
if (entityTitle != undefined && entityTitle != null && entityTitle != "") {
result.string(neon.COMPONENTSTATE_READONLY);
......
entity/PermissionDetail_entity/entityfields/entity/valueProcess.js
+ 2
− 2
View file @ f4c775bc
......@@ -5,8 +5,8 @@ import("system.neon");
var recordstate = vars.get("$sys.recordstate");
var entity = "";
if(vars.exists("$param.EntityTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
entity = vars.get("$param.EntityTitle_param");
if(vars.exists("$param.EntityId_param") && recordstate == neon.OPERATINGSTATE_NEW) {
entity = vars.get("$param.EntityId_param");
} else {
entity = vars.get("$field.ENTITY");
}
......
entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js
+ 2
− 2
View file @ f4c775bc
......@@ -6,8 +6,8 @@ import("system.neon");
var recordstate = vars.get("$sys.recordstate");
var role = "";
if (vars.exists("$param.RoleTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
role = vars.get("$param.RoleTitle_param");
if (vars.exists("$param.RoleName_param") && recordstate == neon.OPERATINGSTATE_NEW) {
role = vars.get("$param.RoleName_param");
} else {
role = vars.get("$this.value"); // this.value is already role title - role name gets converted to role title in contentProcess
}
......
entity/PermissionDetail_entity/entityfields/role/stateProcess.js
+ 1
− 1
View file @ f4c775bc
......@@ -2,7 +2,7 @@ import("system.result");
import("system.vars");
import("system.neon");
var roleTitle = vars.get("$param.RoleTitle_param");
var roleTitle = vars.get("$param.RoleName_param");
if (roleTitle != undefined && roleTitle != null && roleTitle != "") {
result.string(neon.COMPONENTSTATE_READONLY);
......
entity/PermissionDetail_entity/entityfields/role/valueProcess.js
+ 2
− 2
View file @ f4c775bc
......@@ -6,8 +6,8 @@ import("system.neon");
var recordstate = vars.get("$sys.recordstate");
var role = "";
if (vars.exists("$param.RoleTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) {
role = vars.get("$param.RoleTitle_param");
if (vars.exists("$param.RoleName_param") && recordstate == neon.OPERATINGSTATE_NEW) {
role = vars.get("$param.RoleName_param");
} else {
role = PermissionUtil.resolveRoleTitle(vars.get("$this.value"));
}
......
entity/PermissionDetail_entity/iconIdProcess.js
+ 2
− 2
View file @ f4c775bc
......@@ -3,9 +3,9 @@ import("system.result");
switch (vars.get("$field.ACCESSTYPE")) {
case "E":
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
result.string("VAADIN:CONNECT");
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
result.string("VAADIN:USER_CHECK");
}
break;
......
entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+ 5
− 5
View file @ f4c775bc
......@@ -52,10 +52,10 @@ else if (entitiesUsePermFlagSet.length > 0)
querySelect.and(newWhereIfSet("ASYS_PERMISSIONSET.FIELD_ID", fieldsUsePermFlagSet, SqlBuilder.IN(), undefined, alias)
.or("FIELD_ID is NULL"));
if (vars.get("$param.RoleTitle_param")) {
querySelect.and("ASYS_PERMISSIONSET.ROLE_ID", "$param.RoleTitle_param")
} else if (vars.get("$param.EntityTitle_param")) {
querySelect.and("ASYS_PERMISSIONSET.ENTITY_ID", "$param.EntityTitle_param")
if (vars.get("$param.RoleName_param")) {
querySelect.and("ASYS_PERMISSIONSET.ROLE_ID", "$param.RoleName_param")
} else if (vars.get("$param.EntityId_param")) {
querySelect.and("ASYS_PERMISSIONSET.ENTITY_ID", "$param.EntityId_param")
}
// get all permissions which are already in db
......@@ -206,7 +206,7 @@ function sortResultsByCondition(a, b) {
}
function sortResultByTitleAlphabetically(a, b) {
if (vars.get("$param.RoleTitle_param")) {
if (vars.get("$param.RoleName_param")) {
if (a[1] < b[1]) return -1;
if (a[1] > b[1]) return 1;
return 0;
......
entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+ 2
− 2
View file @ f4c775bc
......@@ -57,7 +57,7 @@
</dependency>
<children>
<entityParameter>
<name>EntityTitle_param</name>
<name>EntityId_param</name>
<valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
......@@ -72,7 +72,7 @@
</dependency>
<children>
<entityParameter>
<name>EntityTitle_param</name>
<name>EntityId_param</name>
<valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
......
entity/PermissionOverview_entity/PermissionOverview_entity.aod
+ 2
− 2
View file @ f4c775bc
......@@ -76,12 +76,12 @@
</dependencies>
</entityProvider>
<entityParameter>
<name>RoleTitle_param</name>
<name>RoleName_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>EntityTitle_param</name>
<name>EntityId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
......
entity/PermissionOverview_entity/entityfields/entity/titleProcess.js
+ 2
− 2
View file @ f4c775bc
......@@ -2,8 +2,8 @@ import("system.result");
import("system.vars");
import("system.translate");
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
result.string(translate.text("Entity"));
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
result.string(translate.text("Role"));
}
\ No newline at end of file
entity/PermissionOverview_entity/iconIdProcess.js
+ 2
− 2
View file @ f4c775bc
import("system.vars");
import("system.result");
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
result.string("VAADIN:CONNECT");
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
result.string("VAADIN:USER_CHECK");
}
\ No newline at end of file
entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+ 6
− 6
View file @ f4c775bc
......@@ -25,8 +25,8 @@ for each (let entityMetaData in entitiesMetaData) {
var rolesOrEntitiesSelect = new SqlBuilder(alias).where();
var rolesOrEntities = [];
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
roleName = vars.getString("$param.RoleTitle_param");
if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
roleName = vars.getString("$param.RoleName_param");
if (roleName == roleInternalEveryone) {
var counter = 0;
for each (let entityUsePermFlagSet in entitiesUsePermFlagSet) {
......@@ -39,8 +39,8 @@ if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param"))
rolesOrEntitiesSelect.select("distinct ASYS_PERMISSIONSET.ENTITY_ID")
.from("ASYS_PERMISSIONSET")
.and("ASYS_PERMISSIONSET.ROLE_ID", roleName);
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
entityName = vars.getString("$param.EntityTitle_param");
} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
entityName = vars.getString("$param.EntityId_param");
if (PermissionUtil.getNumberOfPermissions(entityName, roleInternalEveryone) == 0) {
// no permissions for INTERNAL_EVERYONE found -> display X's for all actions
res.push(["NOREALPERMINDB", roleInternalEveryone, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"]);
......@@ -56,9 +56,9 @@ rolesOrEntities = rolesOrEntitiesSelect
var entityPermSetId = "";
for each (var entry in rolesOrEntities) { // entry contains either a role or an entity, depending on which param exists
if (vars.exists("$param.RoleTitle_param") && vars.get("$param.RoleTitle_param")) {
if (vars.exists("$param.RoleName_param") && vars.get("$param.RoleName_param")) {
entityPermSetId = PermissionUtil.getSetRoot(roleName, entry);
} else if (vars.exists("$param.EntityTitle_param") && vars.get("$param.EntityTitle_param")) {
} else if (vars.exists("$param.EntityId_param") && vars.get("$param.EntityId_param")) {
entityPermSetId = PermissionUtil.getSetRoot(entry, entityName);
}
var recordPermSetId = newSelect("ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID", alias)
......
entity/Role_entity/Role_entity.aod
+ 2
− 2
View file @ f4c775bc
......@@ -43,7 +43,7 @@
<name>TheirPermissions</name>
<children>
<entityParameter>
<name>RoleTitle_param</name>
<name>RoleName_param</name>
<valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
......@@ -57,7 +57,7 @@
<name>PermissionOverviews</name>
<children>
<entityParameter>
<name>RoleTitle_param</name>
<name>RoleName_param</name>
<valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment