From 681a97a5314279cab5b19ac2e077e77b913c7bcf Mon Sep 17 00:00:00 2001
From: Simon Leipold <s.leipold@adito.de>
Date: Mon, 27 May 2019 13:45:45 +0200
Subject: [PATCH] Permissions - edit view for permissions now fills fields
correctly
---
.../entityfields/entity/displayValueProcess.js | 14 +++++++++-----
.../entityfields/entity/valueProcess.js | 14 +++++++++-----
.../entityfields/role/displayValueProcess.js | 17 ++++++++++-------
.../entityfields/role/valueProcess.js | 17 ++++++++++-------
.../recordcontainers/jdito/onUpdate.js | 2 +-
5 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js
index dba6c0a34a..d6e5c24e75 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 dba6c0a34a..d6e5c24e75 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 c03a14ebfb..52441e881a 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 9c569f8538..00ceec30b9 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 7ccb059127..85217be974 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");
--
GitLab