Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-26 12:25:20 +01:00
Code Issues Projects Releases Wiki Activity

[KeyConnector] Updated remove warning in details view (#1309)

Browse Source
This commit is contained in:
Oscar Hinton 2021-11-22 18:39:20 +01:00 committed by GitHub
parent a6abb74810
commit 0490314cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/organizations/manage/people.component.ts
View File

@ -193,6 +193,7 @@ export class PeopleComponent extends BasePeopleComponent<OrganizationUserUserDet
comp.name = this.userNamePipe.transform(user); comp.name = this.userNamePipe.transform(user);
comp.organizationId = this.organizationId; comp.organizationId = this.organizationId;
comp.organizationUserId = user != null ? user.id : null; comp.organizationUserId = user != null ? user.id : null;
comp.usesKeyConnector = user?.usesKeyConnector;
comp.onSavedUser.subscribe(() => { comp.onSavedUser.subscribe(() => {
modal.close(); modal.close();
this.load(); this.load();

6
src/app/organizations/manage/user-add-edit.component.ts
View File

@ -33,6 +33,7 @@ export class UserAddEditComponent implements OnInit {
@Input() name: string; @Input() name: string;
@Input() organizationUserId: string; @Input() organizationUserId: string;
@Input() organizationId: string; @Input() organizationId: string;
@Input() usesKeyConnector: boolean = false;
@Output() onSavedUser = new EventEmitter(); @Output() onSavedUser = new EventEmitter();
@Output() onDeletedUser = new EventEmitter(); @Output() onDeletedUser = new EventEmitter();
@ -193,9 +194,10 @@ export class UserAddEditComponent implements OnInit {
return; return;
} }
const message = this.usesKeyConnector ? 'removeUserConfirmationKeyConnector' : 'removeUserConfirmation';
const confirmed = await this.platformUtilsService.showDialog( const confirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('removeUserConfirmation'), this.name, this.i18nService.t(message), this.name, this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'
this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); );
if (!confirmed) { if (!confirmed) {
return false; return false;
} }