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

[Policy] Personal Ownership (#1481)

Browse Source 
* Initial commit for personal ownership

* Removed TODO // Updated allowPersonalOwnership logic to include necessary org/user checks

* Fixed import order

* Updated jslib (dcbd09e -> 72bf18f)

* Fixed casing for error message
This commit is contained in:
Vincent Salucci
2020-12-09 14:11:25 -06:00
committed by GitHub
parent e42360a1b2
commit a1542f050d
6 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/popup/vault/add-edit.component.html
View File

@@ -340,7 +340,7 @@
</div>
</div>
</div>
<div class="box" *ngIf="(!editMode || cloneMode) && ownershipOptions && ownershipOptions.length > 1">
<div class="box" *ngIf="allowOwnershipOptions()">
<div class="box-header">
{{'ownership' | i18n}}
</div>

10
src/popup/vault/add-edit.component.ts
View File

@@ -15,6 +15,7 @@ import { FolderService } from 'jslib/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service';
import { StateService } from 'jslib/abstractions/state.service';
import { UserService } from 'jslib/abstractions/user.service';
@@ -36,9 +37,9 @@ export class AddEditComponent extends BaseAddEditComponent {
userService: UserService, collectionService: CollectionService,
messagingService: MessagingService, private route: ActivatedRoute,
private router: Router, private location: Location,
eventService: EventService) {
eventService: EventService, policyService: PolicyService) {
super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
userService, collectionService, messagingService, eventService);
userService, collectionService, messagingService, eventService, policyService);
}
async ngOnInit() {
@@ -161,4 +162,9 @@ export class AddEditComponent extends BaseAddEditComponent {
const u = (uri as any);
u.showCurrentUris = !u.showCurrentUris;
}
allowOwnershipOptions(): boolean {
return (!this.editMode || this.cloneMode) && this.ownershipOptions
&& (this.ownershipOptions.length > 1 || !this.allowPersonal);
}
}