Smaller fixes
Some checks failed
Build on push / prepare (push) Successful in 5s
Build on push / build-redirector (push) Successful in 29s
Build on push / build-api (push) Successful in 31s
Build on push / build-web (push) Successful in 59s
Test before pr merge / test-translation-lint (pull_request) Successful in 41s
Test before pr merge / test-lint (pull_request) Failing after 45s
Test before pr merge / test-before-merge (pull_request) Successful in 1m38s
Some checks failed
Build on push / prepare (push) Successful in 5s
Build on push / build-redirector (push) Successful in 29s
Build on push / build-api (push) Successful in 31s
Build on push / build-web (push) Successful in 59s
Test before pr merge / test-translation-lint (pull_request) Successful in 41s
Test before pr merge / test-lint (pull_request) Failing after 45s
Test before pr merge / test-before-merge (pull_request) Successful in 1m38s
This commit is contained in:
parent
455d8208f5
commit
a26a4841bd
@ -6,6 +6,7 @@ import {
|
|||||||
} from 'src/app/core/base/page.columns';
|
} from 'src/app/core/base/page.columns';
|
||||||
import { TableColumn } from 'src/app/modules/shared/components/table/table.model';
|
import { TableColumn } from 'src/app/modules/shared/components/table/table.model';
|
||||||
import { User } from 'src/app/model/auth/user';
|
import { User } from 'src/app/model/auth/user';
|
||||||
|
import { Group } from 'src/app/model/entities/group';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class UsersColumns extends PageColumns<User> {
|
export class UsersColumns extends PageColumns<User> {
|
||||||
@ -24,6 +25,14 @@ export class UsersColumns extends PageColumns<User> {
|
|||||||
type: 'text',
|
type: 'text',
|
||||||
value: (row: User) => row.email,
|
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,
|
...DB_MODEL_COLUMNS,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -61,6 +61,10 @@ export class UsersDataService
|
|||||||
keycloakId
|
keycloakId
|
||||||
username
|
username
|
||||||
email
|
email
|
||||||
|
roles {
|
||||||
|
id
|
||||||
|
name
|
||||||
|
}
|
||||||
|
|
||||||
...DB_MODEL
|
...DB_MODEL
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
(onClose)="close()">
|
(onClose)="close()">
|
||||||
<ng-template formPageHeader let-isUpdate>
|
<ng-template formPageHeader let-isUpdate>
|
||||||
<h2>
|
<h2>
|
||||||
{{ 'common.group' | translate }}
|
{{ 'common.domain' | translate }}
|
||||||
{{
|
{{
|
||||||
(isUpdate ? 'sidebar.header.update' : 'sidebar.header.create')
|
(isUpdate ? 'sidebar.header.update' : 'sidebar.header.create')
|
||||||
| translate
|
| translate
|
||||||
|
Loading…
Reference in New Issue
Block a user