Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure remove user confirmation modal contains correct role prefix #2508

Merged
merged 1 commit into from
Jun 23, 2018
Merged

Ensure remove user confirmation modal contains correct role prefix #2508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/frontend/app/shared/components/list/list-types/cf-users/cf-permission-cell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export abstract class CfPermissionCell<T> extends TableCellCustom<APIResource<Cf
return cellPermissionList.map(perm => {
const chipConfig = new AppChip<ICellPermissionList<T>>();
chipConfig.key = perm;
chipConfig.value = perm.name ? `${perm.name}: ${perm.string}` : perm.string;
chipConfig.value = this.permissionString(perm);
chipConfig.busy = perm.busy;
chipConfig.clearAction = chip => {
const permission = chip.key;
Expand Down Expand Up @@ -95,7 +95,7 @@ export abstract class CfPermissionCell<T> extends TableCellCustom<APIResource<Cf
protected removePermissionWarn(cellPermission: ICellPermissionList<T>) {
const confirmation = new ConfirmationDialogConfig(
'Remove Permission',
`Are you sure you want to remove permission '${cellPermission.name}: ${cellPermission.string}'` +
`Are you sure you want to remove permission '${this.permissionString(cellPermission)}'` +
` from user '${cellPermission.userName}'?`,
'Delete',
true
Expand All @@ -111,6 +111,10 @@ export abstract class CfPermissionCell<T> extends TableCellCustom<APIResource<Cf
});
}

private permissionString(perm: ICellPermissionList<T>): string {
return perm.name ? `${perm.name}: ${perm.string}` : perm.string;
}

protected removePermission(cellPermission: ICellPermissionList<T>, updateConnectedUser: boolean) {

}
Expand Down