vw_small

commit 0a3b84b81563361f8ab6a4b4b74693c7d0132ea5
parent fe473b9e75342c76a2002f9a24bff4b218e91aae
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Thu, 30 Aug 2018 16:47:08 +0200

Merge pull request #165 from mprasil/shared_edit_fix

Fix editing shared cipher (fixes #164)
Diffstat:
M
src/api/core/ciphers.rs
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -136,7 +136,9 @@ fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Head
     if let Some(org_id) = data.OrganizationId {
         match UserOrganization::find_by_user_and_org(&headers.user.uuid, &org_id, &conn) {
             None => err!("You don't have permission to add item to organization"),
-            Some(org_user) => if shared_to_collection || org_user.has_full_access() {
+            Some(org_user) => if shared_to_collection 
+                              || org_user.has_full_access() 
+                              || cipher.is_write_accessible_to_user(&headers.user.uuid, &conn) {
                 cipher.organization_uuid = Some(org_id);
                 cipher.user_uuid = None;
             } else {