Skip to content
Snippets Groups Projects
Commit cd6a700f authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '#1066095-RoleAssignable' into '2020.2.0'

#1066095-RoleAssignable Richtiges Auswerten und Holen

See merge request xrm/basic!423
parents 919106c3 5cf8f0ec
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTi
var excludeRolesArray = EmployeeRole.getExcludeRoles();
for each (let role in tools.getAllRoles()) {
if (!role[4]) {
if (role[4] == "false") {
excludeRolesArray.push(role[3]);
}
}
......
......@@ -27,7 +27,7 @@ for each (let role in allRoles) {
var roleName = role[3];
if (!excludeRoles[roleName]) {
let numberOfUsersInSelectedRole = tools.getUsersWithRole(roleName).length;
res.push([roleName, roleName, role[0], role[1], role[2], numberOfUsersInSelectedRole + " " + translate.text("User", locale), role[4] ? "1" : "0"]);
res.push([roleName, roleName, role[0], role[1], role[2], numberOfUsersInSelectedRole + " " + translate.text("User", locale), role[4] == "true" ? "1" : "0"]);
}
}
......
......@@ -44,6 +44,10 @@
<name>7b269530-309a-4599-a392-f6e2651ccb65</name>
<entityField>ROLEDESCRIPTION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ca78de72-e6f2-432a-b7ea-bf6ab74f1c84</name>
<entityField>IS_ASSIGNABLE</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment