Merge branch '1053158_FixEmployeeRolesSelectionNull' into '2020.1'

1053158 fix employee roles selection null

See merge request xrm/basic!247

entity/EmployeeRole_entity/entityfields/role/displayValueProcess.js

@@ -3,8 +3,11 @@ import("system.vars");
 import("system.tools");
 
 var allRoles = tools.getAllRoles();
-var roleTitle = vars.get("$field.ROLE");
-if (roleTitle in allRoles)
-    roleTitle = allRoles[roleTitle][0];
+var roleTitle = vars.get("$this.value")
+if(roleTitle != null)
+{
+    if (roleTitle in allRoles)
+        roleTitle = allRoles[roleTitle][0];
 
-result.string(roleTitle);
\ No newline at end of file
+    result.string(roleTitle);
+}
\ No newline at end of file

entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js

@@ -3,6 +3,7 @@ import("system.vars");
 import("system.tools");
 
 var roles = [];
+var singleRole = [];
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
 var allRoles = tools.getAllRoles();
 
@@ -33,8 +34,23 @@ if (ids != null)
             if (role[0] == ids[i])
                 return true;
         }
-        return false;
+        return ids[i];
     });
 }
-    
-result.object(roles);
\ No newline at end of file
+if(roles == undefined || roles.length > 0)
+    result.object(roles);
+else
+{
+    var currentRole = vars.get("$field.ROLE")
+    roles = roles.filter(function(role) 
+    {
+        for (let i = 0; i < ids.length; i++)
+        {
+            if (role[0] == currentRole)
+                return true;
+        }
+        return vars.get("$field.ROLE");
+    });
+    singleRole[0] = [currentRole.toUpperCase(), currentRole.toUpperCase(), allRoles[currentRole][0], "Role"];
+    result.object(singleRole)
+}
\ No newline at end of file

neonContext/EmployeeRole/EmployeeRole.aod

@@ -2,6 +2,8 @@
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
   <name>EmployeeRole</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>EmployeeRoleFilter_view</filterView>
+  <editView>EmployeeRoleGenericEdit_view</editView>
   <entity>EmployeeRole_entity</entity>
   <references>
     <neonViewReference>
@@ -12,5 +14,9 @@
       <name>6ec0af90-47aa-4f94-8e05-7c535bd4c965</name>
       <view>EmployeeRoleEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>7edde309-9804-4d46-8ac0-d7642f66b584</name>
+      <view>EmployeeRoleGenericEdit_view</view>
+    </neonViewReference>
   </references>
 </neonContext>

neonView/EmployeeRoleFilter_view/EmployeeRoleFilter_view.aod

@@ -10,7 +10,6 @@
   <children>
     <tableViewTemplate>
       <name>Table</name>
-      <inlineEdit v="true" />
       <entityField>#ENTITY</entityField>
       <autoNewRow v="true" />
       <columns>

neonView/EmployeeRoleGenericEdit_view/EmployeeRoleGenericEdit_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>EmployeeRoleGenericEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>d7333f5e-1ec2-4169-b135-e0fa31bc5f3d</name>
+          <entityField>ROLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4ff47cc3-15e9-4e91-9f16-919c226009b4</name>
+          <entityField>UID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>