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

allow bulk sharing of items with new attachments

Browse Source
This commit is contained in:
Kyle Spearrin 2018-11-15 12:56:07 -05:00
parent 05cfa99ea0
commit ac1f8a69e1
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit f514e2bb676cb0ecca81c678cb054ce596999971 Subproject commit be080f4f17b782fdb22c77560bd235e81346fb21

2
src/app/vault/bulk-share.component.html
View File

@ -11,7 +11,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>{{'shareManyDesc' | i18n}}</p> <p>{{'shareManyDesc' | i18n}}</p>
<p>{{'shareSelectedItemsDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}}</p> <p>{{'shareSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}}</p>
<div class="form-group"> <div class="form-group">
<label for="organization">{{'organization' | i18n}}</label> <label for="organization">{{'organization' | i18n}}</label>
<select id="organization" name="OrganizationId" [(ngModel)]="organizationId" class="form-control" (change)="filterCollections()"> <select id="organization" name="OrganizationId" [(ngModel)]="organizationId" class="form-control" (change)="filterCollections()">

2
src/app/vault/bulk-share.component.ts
View File

@ -41,7 +41,7 @@ export class BulkShareComponent implements OnInit {
private collectionService: CollectionService, private userService: UserService) { } private collectionService: CollectionService, private userService: UserService) { }
async ngOnInit() { async ngOnInit() {
this.shareableCiphers = this.ciphers.filter((c) => !c.hasAttachments && c.organizationId == null); this.shareableCiphers = this.ciphers.filter((c) => !c.hasOldAttachments && c.organizationId == null);
this.nonShareableCount = this.ciphers.length - this.shareableCiphers.length; this.nonShareableCount = this.ciphers.length - this.shareableCiphers.length;
const allCollections = await this.collectionService.getAllDecrypted(); const allCollections = await this.collectionService.getAllDecrypted();
this.writeableCollections = allCollections.filter((c) => !c.readOnly); this.writeableCollections = allCollections.filter((c) => !c.readOnly);

4
src/locales/en/messages.json
View File

@ -748,8 +748,8 @@
} }
} }
}, },
"shareSelectedItemsDesc": { "shareSelectedItemsCountDesc": {
"message": "You have selected $COUNT$ item(s). $SHAREABLE_COUNT$ items are sharable, $NONSHAREABLE_COUNT$ are not. Items with attachments must be shared individually.", "message": "You have selected $COUNT$ item(s). $SHAREABLE_COUNT$ items are sharable, $NONSHAREABLE_COUNT$ are not.",
"placeholders": { "placeholders": {
"count": { "count": {
"content": "$1", "content": "$1",