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

Remove unnecessary fallbacks (#1245)

Browse Source 
Web is in lock-step to server version. We do not need fallbacks
since we're sure the server version will support collection permissions split.
This commit is contained in:
Matt Gibson 2021-10-19 08:08:15 -05:00 committed by GitHub
parent 3ee61fef96
commit 1de569e64d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/organizations/manage/user-add-edit.component.html
View File

@ -80,20 +80,7 @@
<div class="mb-3"> <div class="mb-3">
<label class="font-weight-bold mb-0">Manager Permissions</label> <label class="font-weight-bold mb-0">Manager Permissions</label>
<hr class="my-0 mr-2" /> <hr class="my-0 mr-2" />
<!-- Deprecated Sep 29 2021 --> <app-nested-checkbox parentId="manageAssignedCollections"
<div class="form-group mb-0" *ngIf="fallbackToManageAssignedCollections">
<div class="form-check mt-1 form-check-block">
<input class="form-check-input" type="checkbox" name="manageAssignedCollections"
id="manageAssignedCollections"
[(ngModel)]="permissions.manageAssignedCollections">
<label class="form-check-label font-weight-normal"
for="manageAssignedCollections">
{{'manageAssignedCollections' | i18n}}
</label>
</div>
</div>
<!-- -->
<app-nested-checkbox *ngIf="!fallbackToManageAssignedCollections" parentId="manageAssignedCollections"
[checkboxes]="manageAssignedCollectionsCheckboxes"> [checkboxes]="manageAssignedCollectionsCheckboxes">
</app-nested-checkbox> </app-nested-checkbox>
</div> </div>
@ -129,18 +116,7 @@
</label> </label>
</div> </div>
</div> </div>
<!-- Deprecated 29 Sep 2021 --> <app-nested-checkbox parentId="manageAllCollections"
<div class="form-group mb-0" *ngIf="fallbackToManageAllCollections">
<div class="form-check mt-1 form-check-block">
<input class="form-check-input" type="checkbox" name="manageAllCollections"
id="manageAllCollections" [(ngModel)]="permissions.manageAllCollections">
<label class="form-check-label font-weight-normal" for="manageAllCollections">
{{'manageAllCollections' | i18n}}
</label>
</div>
</div>
<!-- -->
<app-nested-checkbox *ngIf="!fallbackToManageAllCollections" parentId="manageAllCollections"
[checkboxes]="manageAllCollectionsCheckboxes"> [checkboxes]="manageAllCollectionsCheckboxes">
</app-nested-checkbox> </app-nested-checkbox>
<div class="form-group mb-0"> <div class="form-group mb-0">

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

@ -79,19 +79,6 @@ export class UserAddEditComponent implements OnInit {
}, },
]; ];
get fallbackToManageAllCollections() {
return this.editMode &&
this.permissions.createNewCollections == null &&
this.permissions.editAnyCollection == null &&
this.permissions.deleteAnyCollection == null;
}
get fallbackToManageAssignedCollections() {
return this.editMode &&
this.permissions.editAssignedCollections == null &&
this.permissions.deleteAssignedCollections == null;
}
get customUserTypeSelected(): boolean { get customUserTypeSelected(): boolean {
return this.type === OrganizationUserType.Custom; return this.type === OrganizationUserType.Custom;
} }