diff --git a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js index ec9b6a85be776001ddde159f2a7ba106dea279a9..e01abb5791339a870c4957c702d1b55144f5ba9e 100644 --- a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js +++ b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js @@ -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]); } } diff --git a/entity/Role_entity/recordcontainers/jdito/contentProcess.js b/entity/Role_entity/recordcontainers/jdito/contentProcess.js index 25ef04f7b115f5000691f3747eb8d9d4d0b269d0..4020fb58c7fd134823176eb9a0caf39b7ba8215b 100644 --- a/entity/Role_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/Role_entity/recordcontainers/jdito/contentProcess.js @@ -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"]); } } diff --git a/neonView/RoleFilter_view/RoleFilter_view.aod b/neonView/RoleFilter_view/RoleFilter_view.aod index ca69cff2b79dfbf0c4c39c24b234f6634bafa122..612096e53f13856ffecdd786ed760b697a96d532 100644 --- a/neonView/RoleFilter_view/RoleFilter_view.aod +++ b/neonView/RoleFilter_view/RoleFilter_view.aod @@ -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>