[Projekt: Entwicklung - Neon][TicketNr.: 1053536][Neuanlage von Rolle mit Kindrollen wirft Fehler]

entity/RoleChildren_entity/RoleChildren_entity.aod

@@ -45,6 +45,10 @@
         <fieldName>Roles</fieldName>
       </dependency>
     </entityConsumer>
+    <entityParameter>
+      <name>RoleType_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/RoleChildren_entity/recordcontainers/jdito/contentProcess.js

+import("system.neon");
 import("Sql_lib");
 import("system.db");
 import("system.vars");
@@ -6,15 +7,21 @@ import("system.util");
 
 var alias = SqlUtils.getSystemAlias();
 var selectedRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param");
+var selectedRoleType = vars.exists("$param.RoleType_param") && vars.get("$param.RoleType_param");
 var children = [];
 
+if (selectedRoleType == "" && selectedRoleName != "") {
+    selectedRoleType = "CUSTOM";
+    selectedRoleName = selectedRoleType + "_" + selectedRoleName;
+}
+
 // roles can only be assigned to CUSTOM roles -> selected role has to be a viable CUSTOM role
-if (selectedRoleName && selectedRoleName.indexOf("CUSTOM_") != -1) {
+if (selectedRoleName && selectedRoleType == "CUSTOM") {
     var childRoles = newSelect("ID, CHILD_ROLE", alias)
-    .from("ASYS_ROLES_CHILDREN")
-    .where("ASYS_ROLES_CHILDREN.PARENT_ROLE", selectedRoleName)
-    .table();
-
+        .from("ASYS_ROLES_CHILDREN")
+        .where("ASYS_ROLES_CHILDREN.PARENT_ROLE", selectedRoleName)
+        .table();
+    
     for each (let childRole in childRoles) {
         children.push([childRole[0], childRole[1], selectedRoleName]);
     }

entity/RoleChildren_entity/recordcontainers/jdito/onInsert.js

+import("system.neon");
 import("system.util");
 import("system.db");
 import("Sql_lib");
 import("system.result");
 import("system.vars");
 
-var parentRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param")
+var selectedRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param")
+var selectedRoleType = vars.exists("$param.RoleType_param") && vars.get("$param.RoleType_param");
 
-if (parentRoleName && parentRoleName.indexOf("CUSTOM_") != -1) {
-    var alias = SqlUtils.getSystemAlias();
-    var childRole = vars.get("$local.rowdata")["CHILD_ROLE.value"];
-    var uid = vars.get("$field.UID") 
-    db.insertData("ASYS_ROLES_CHILDREN", ["CHILD_ROLE", "PARENT_ROLE", "ID"], null, [childRole, parentRoleName, uid], alias);
-}
\ No newline at end of file
+if (selectedRoleType == "" && selectedRoleName != "") {
+    selectedRoleType = "CUSTOM";
+    selectedRoleName = selectedRoleType + "_" + selectedRoleName;
+}
+
+var alias = SqlUtils.getSystemAlias();
+var childRole = vars.get("$local.rowdata")["CHILD_ROLE.value"];
+var uid = vars.get("$field.UID") 
+db.insertData("ASYS_ROLES_CHILDREN", ["CHILD_ROLE", "PARENT_ROLE", "ID"], null, [childRole, selectedRoleName, uid], alias);
\ No newline at end of file

entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js

@@ -4,9 +4,10 @@ import("Sql_lib");
 import("system.result");
 import("system.vars");
 
-var parentRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param")
+var selectedRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param");
+var selectedRoleType = vars.exists("$param.RoleType_param") && vars.get("$param.RoleType_param");
 
-if (parentRoleName && parentRoleName.indexOf("CUSTOM_") != -1) {
+if (selectedRoleName && selectedRoleType == "CUSTOM") {
     var alias = SqlUtils.getSystemAlias();
     var childRole = vars.get("$local.rowdata")["CHILD_ROLE.value"];
 

entity/Role_entity/Role_entity.aod

@@ -143,6 +143,10 @@
           <name>RoleId_param</name>
           <valueProcess>%aditoprj%/entity/Role_entity/entityfields/rolechildrens/children/roleid_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>RoleType_param</name>
+          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/rolechildrens/children/roletype_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityActionField>

entity/Role_entity/entityfields/rolechildrens/children/roletype_param/valueProcess.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ROLETYPE"));
\ No newline at end of file