diff --git a/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js index dba6c0a34aaa5bad442ba537bc64c7188a472f77..d6e5c24e75eed9d70d14526054b11a129a22f83b 100644 --- a/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js +++ b/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js @@ -3,10 +3,14 @@ import("system.result"); import("system.neon"); var recordstate = vars.get("$sys.recordstate"); +var entity = ""; -if(vars.exists("$param.EntityTitle_param") && (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)) { - var entity = vars.get("$param.EntityTitle_param"); - if (entity != undefined && entity != null && entity != "") { - result.string(entity); - } +if(vars.exists("$param.EntityTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) { + entity = vars.get("$param.EntityTitle_param"); +} else { + entity = vars.get("$field.ENTITY"); +} + +if (entity != undefined && entity != null && entity != "") { + result.string(entity); } \ No newline at end of file diff --git a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js index dba6c0a34aaa5bad442ba537bc64c7188a472f77..d6e5c24e75eed9d70d14526054b11a129a22f83b 100644 --- a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js +++ b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js @@ -3,10 +3,14 @@ import("system.result"); import("system.neon"); var recordstate = vars.get("$sys.recordstate"); +var entity = ""; -if(vars.exists("$param.EntityTitle_param") && (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)) { - var entity = vars.get("$param.EntityTitle_param"); - if (entity != undefined && entity != null && entity != "") { - result.string(entity); - } +if(vars.exists("$param.EntityTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) { + entity = vars.get("$param.EntityTitle_param"); +} else { + entity = vars.get("$field.ENTITY"); +} + +if (entity != undefined && entity != null && entity != "") { + result.string(entity); } \ No newline at end of file diff --git a/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js index c03a14ebfbba9b1d44de9bd812e0fec51f9caedc..52441e881a88129c5c236292600bfb1b747e1cbe 100644 --- a/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js +++ b/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js @@ -3,12 +3,15 @@ import("system.result"); import("system.neon"); var recordstate = vars.get("$sys.recordstate"); +var role = ""; -if (vars.exists("$param.RoleTitle_param")) { - var role = vars.get("$param.RoleTitle_param"); - - if(role != undefined && role != null && role != "" && (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)) { - res = role.split("_"); - result.string(res[1]); - } +if (vars.exists("$param.RoleTitle_param") && recordstate == neon.OPERATINGSTATE_NEW) { + role = vars.get("$param.RoleTitle_param"); +} else { + role = vars.get("$field.ROLE"); +} + +if(role != undefined && role != null && role != "") { + res = role.split("_"); + result.string(res[1]); } \ No newline at end of file diff --git a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js index 9c569f853853db8419f44247c1e500313bdbf0d6..00ceec30b99adb85ec545626479bc0e26c49fbca 100644 --- a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js +++ b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js @@ -1,12 +1,15 @@ +import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); -let recordstate = vars.get("$sys.recordstate"); +var recordstate = vars.get("$sys.recordstate"); +var role = ""; -if(vars.exists("$param.RoleTitle_param") && (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)) { - var role = vars.get("$param.RoleTitle_param"); - if (role != undefined && role != null && role != "") { - result.string(role); - } -} \ No newline at end of file +if(vars.exists("$param.RoleTitle_param") && (recordstate == neon.OPERATINGSTATE_NEW)) { + role = vars.get("$param.RoleTitle_param"); +} else { + role = vars.get("$field.ROLE"); +} + +result.string(role); \ No newline at end of file diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js index 7ccb059127d937b668acbb9fe0ce6584377042e6..85217be974ecabcd3063d8059f167d0e2a071f26 100644 --- a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js +++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js @@ -1,5 +1,5 @@ +import("Sql_lib"); import("system.neon"); -import("system.logging"); import("system.util"); import("system.db"); import("system.vars");