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

undo manage rules for org groupings listing

Browse Source
This commit is contained in:
Kyle Spearrin 2018-10-17 15:57:39 -04:00
parent 647388e475
commit af43cd407e
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/organizations/vault/groupings.component.ts
View File

@ -30,16 +30,12 @@ export class GroupingsComponent extends BaseGroupingsComponent {
} }
async loadCollections() { async loadCollections() {
if (!this.organization.isManager) { if (!this.organization.isAdmin) {
await super.loadCollections(this.organization.id); await super.loadCollections(this.organization.id);
return; return;
} }
let collections: ListResponse<CollectionResponse>;
if (this.organization.isAdmin) { const collections = await this.apiService.getCollections(this.organization.id);
collections = await this.apiService.getCollections(this.organization.id);
} else {
collections = await this.apiService.getUserCollections();
}
if (collections != null && collections.data != null && collections.data.length) { if (collections != null && collections.data != null && collections.data.length) {
const collectionDomains = collections.data.map((r) => const collectionDomains = collections.data.map((r) =>
new Collection(new CollectionData(r as CollectionDetailsResponse))); new Collection(new CollectionData(r as CollectionDetailsResponse)));
@ -48,7 +44,6 @@ export class GroupingsComponent extends BaseGroupingsComponent {
this.collections = []; this.collections = [];
} }
if (this.organization.isAdmin) {
const unassignedCollection = new CollectionView(); const unassignedCollection = new CollectionView();
unassignedCollection.name = this.i18nService.t('unassigned'); unassignedCollection.name = this.i18nService.t('unassigned');
unassignedCollection.id = 'unassigned'; unassignedCollection.id = 'unassigned';
@ -56,5 +51,4 @@ export class GroupingsComponent extends BaseGroupingsComponent {
unassignedCollection.readOnly = true; unassignedCollection.readOnly = true;
this.collections.push(unassignedCollection); this.collections.push(unassignedCollection);
} }
}
} }