Browse Source
			
			
			Merge pull request #165 from mprasil/shared_edit_fix
			
				Fix editing shared cipher (fixes #164)
			
			
				pull/169/head
			
			
		 
		
			
				
					
						
						Daniel García
					
					7 years ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 1 changed files with 
3 additions and 
1 deletions
			 
			
		 
		
			
				- 
					
					
					 
					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 { | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |