diff --git a/CHANGELOG.md b/CHANGELOG.md index c2c854086..e48c1319f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file. - [#234](https://github.com/os2display/display-admin-client/pull/234) - Cleaned up code flow in playlist saving. - Changed to chaining relations puts. +- [#235](https://github.com/os2display/display-admin-client/pull/235) + - Added roles to users list. - [#233](https://github.com/os2display/display-admin-client/pull/233) - Fixed issue when clicking media archive element when media archive is not in multiple mode. - [#232](https://github.com/os2display/display-admin-client/pull/232) diff --git a/src/components/users/user-columns.jsx b/src/components/users/user-columns.jsx index cd516c2e7..10ac5ae6c 100644 --- a/src/components/users/user-columns.jsx +++ b/src/components/users/user-columns.jsx @@ -16,6 +16,12 @@ function getUserColumns() { path: "fullName", label: t("columns.full-name"), }, + { + path: "roles", + label: t("columns.roles"), + dataFunction: (roles) => + roles.map((role) => t(`roles.${role}`)).join(", "), + }, { path: "userType", label: t("columns.user-type"), diff --git a/src/translations/da/common.json b/src/translations/da/common.json index 8b8d433b5..fdf61f500 100644 --- a/src/translations/da/common.json +++ b/src/translations/da/common.json @@ -91,7 +91,18 @@ "activated": "Aktiv", "full-name": "Navn", "created-at": "Oprettelsesdato", - "user-type": "Brugertype" + "user-type": "Brugertype", + "roles": "Roller" + }, + "roles": { + "ROLE_USER": "Bruger", + "ROLE_SCREEN": "Skærm", + "ROLE_EDITOR": "Redaktør", + "ROLE_EXTERNAL_USER": "Ekstern bruger", + "ROLE_EXTERNAL_USER_ADMIN": "Ekstern brugeradministrator", + "ROLE_USER_ADMIN": "Brugeradministrator", + "ROLE_ADMIN": "Administrator", + "ROLE_SUPER_ADMIN": "Superadministrator" }, "loading-messages": { "loading-users": "Henter brugere",