bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 10:43:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into soft-delete

Browse Source
This commit is contained in:
Chad Scharf
2020-05-08 09:32:59 -04:00
parent 599f831a09 96208d3760
commit ec3ee8fbb3
10 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ export class PeopleComponent implements OnInit {
}
get allCount() {
return this.allUsers.length;
return this.allUsers != null ? this.allUsers.length : 0;
}
get invitedCount() {

9
src/app/settings/options.component.ts
View File

@@ -70,6 +70,15 @@ export class OptionsComponent implements OnInit {
}
async submit() {
if (this.vaultTimeoutAction === 'logOut') {
const confirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('vaultTimeoutLogOutConfirmation'),
this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'),
this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning');
if (!confirmed) {
return;
}
}
await this.vaultTimeoutService.setVaultTimeoutOptions(this.vaultTimeout != null ? this.vaultTimeout : null,
this.vaultTimeoutAction);
await this.storageService.save(ConstantsService.disableFaviconKey, this.disableIcons);