dev #17

Merged
edraft merged 31 commits from dev into master 2025-03-12 10:09:01 +01:00
3 changed files with 14 additions and 1 deletions
Showing only changes of commit a26a4841bd - Show all commits

View File

@ -6,6 +6,7 @@ import {
} from 'src/app/core/base/page.columns';
import { TableColumn } from 'src/app/modules/shared/components/table/table.model';
import { User } from 'src/app/model/auth/user';
import { Group } from 'src/app/model/entities/group';
@Injectable()
export class UsersColumns extends PageColumns<User> {
@ -24,6 +25,14 @@ export class UsersColumns extends PageColumns<User> {
type: 'text',
value: (row: User) => row.email,
},
{
name: 'roles',
translationKey: 'common.roles',
type: 'text',
filterable: true,
value: (row: User) => row.roles.map(role => role.name).join(', '),
width: '300px',
},
...DB_MODEL_COLUMNS,
];
}

View File

@ -61,6 +61,10 @@ export class UsersDataService
keycloakId
username
email
roles {
id
name
}
...DB_MODEL
}

View File

@ -6,7 +6,7 @@
(onClose)="close()">
<ng-template formPageHeader let-isUpdate>
<h2>
{{ 'common.group' | translate }}
{{ 'common.domain' | translate }}
{{
(isUpdate ? 'sidebar.header.update' : 'sidebar.header.create')
| translate