Skip to content

Commit

Permalink
Merge pull request #235 from aroskanalen/feature/969-user-list-roles
Browse files Browse the repository at this point in the history
Added roles to users list
  • Loading branch information
tuj authored Mar 25, 2024
2 parents 6103048 + be54f8c commit cdf63f6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- [#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)
Expand Down
6 changes: 6 additions & 0 deletions src/components/users/user-columns.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
13 changes: 12 additions & 1 deletion src/translations/da/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit cdf63f6

Please sign in to comment.