From 756c34fcaf033f0cf247fe6c12a99166c9a7a56a Mon Sep 17 00:00:00 2001
From: Simon Leipold <s.leipold@adito.de>
Date: Wed, 5 Feb 2020 10:49:02 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201051235][In=20Custom-Rollen=20sollen=20auch=20Project-Rollen?=
=?UTF-8?q?=20als=20Childrollen=20ausgew=C3=A4hlt=20werden=20k=C3=B6nnen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityfields/child_role/dropDownProcess.js | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/entity/RoleChildren_entity/entityfields/child_role/dropDownProcess.js b/entity/RoleChildren_entity/entityfields/child_role/dropDownProcess.js
index e8c1bbcf92..9d8e51b74c 100644
--- a/entity/RoleChildren_entity/entityfields/child_role/dropDownProcess.js
+++ b/entity/RoleChildren_entity/entityfields/child_role/dropDownProcess.js
@@ -1,16 +1,15 @@
+import("system.tools");
import("system.vars");
-import("system.db");
import("system.result");
-var sqlStr = "select ASYS_ROLES.ROLENAME from ASYS_ROLES";
-var roleNames = db.array(db.COLUMN, sqlStr);
-var parentRole = vars.get("$param.RoleId_param");
var childRoles = [];
+var parentRole = vars.get("$param.RoleId_param");
+var allCustomAndProjectRoles = tools.getAllRoles(["CUSTOM", "PROJECT"], true);
-for each (let roleName in roleNames) {
- if (roleName != parentRole) {
- childRoles.push([roleName, roleName]);
+for each (let role in allCustomAndProjectRoles) {
+ if (role[3] != parentRole) {
+ childRoles.push([role[3], role[3]]);
}
}
-result.object(childRoles);
\ No newline at end of file
+result.object(childRoles.sort());
\ No newline at end of file
--
GitLab