From ac1f8a69e176fef65c1a905ee8114d1fe87ec47c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 15 Nov 2018 12:56:07 -0500
Subject: [PATCH] allow bulk sharing of items with new attachments

---
 jslib                                   | 2 +-
 src/app/vault/bulk-share.component.html | 2 +-
 src/app/vault/bulk-share.component.ts   | 2 +-
 src/locales/en/messages.json            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jslib b/jslib
index f514e2bb67..be080f4f17 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f514e2bb676cb0ecca81c678cb054ce596999971
+Subproject commit be080f4f17b782fdb22c77560bd235e81346fb21
diff --git a/src/app/vault/bulk-share.component.html b/src/app/vault/bulk-share.component.html
index 6313dba140..97079767f0 100644
--- a/src/app/vault/bulk-share.component.html
+++ b/src/app/vault/bulk-share.component.html
@@ -11,7 +11,7 @@
             </div>
             <div class="modal-body">
                 <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">
                     <label for="organization">{{'organization' | i18n}}</label>
                     <select id="organization" name="OrganizationId" [(ngModel)]="organizationId" class="form-control" (change)="filterCollections()">
diff --git a/src/app/vault/bulk-share.component.ts b/src/app/vault/bulk-share.component.ts
index 3746960748..8d04488936 100644
--- a/src/app/vault/bulk-share.component.ts
+++ b/src/app/vault/bulk-share.component.ts
@@ -41,7 +41,7 @@ export class BulkShareComponent implements OnInit {
         private collectionService: CollectionService, private userService: UserService) { }
 
     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;
         const allCollections = await this.collectionService.getAllDecrypted();
         this.writeableCollections = allCollections.filter((c) => !c.readOnly);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 27b513460d..83edd0c2ec 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -748,8 +748,8 @@
       }
     }
   },
-  "shareSelectedItemsDesc": {
-    "message": "You have selected $COUNT$ item(s). $SHAREABLE_COUNT$ items are sharable, $NONSHAREABLE_COUNT$ are not. Items with attachments must be shared individually.",
+  "shareSelectedItemsCountDesc": {
+    "message": "You have selected $COUNT$ item(s). $SHAREABLE_COUNT$ items are sharable, $NONSHAREABLE_COUNT$ are not.",
     "placeholders": {
       "count": {
         "content": "$1",