Browse Source
			
			
			Merge pull request #10763 from nextcloud/fix/noid/new_conversation_creation
			
				fix(NewGroupConversation): minor fix
			
			
				pull/10772/head
			
			
		 
		
			
				
					
						 Dorra
					
					2 years ago
						Dorra
					
					2 years ago
					
						
							committed by
							
								 GitHub
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
				  
				  No known key found for this signature in database
				  
				  	
						GPG Key ID: 4AEE18F83AFDEB23
				  	
				  
				
			
		
		
		
	
		
			
				 2 changed files with 
5 additions and 
3 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/components/ConversationSettings/ConversationAvatarEditor.vue
				
- 
					
					
					 
					src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
				
					
					
						
							
								
									
										
											
	
		
			
				
					|  |  | @ -238,6 +238,8 @@ export default { | 
			
		
	
		
			
				
					|  |  |  | 		}, | 
			
		
	
		
			
				
					|  |  |  | 	}, | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | 	expose: ['saveAvatar'], | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | 	methods: { | 
			
		
	
		
			
				
					|  |  |  | 		activateLocalFilePicker() { | 
			
		
	
		
			
				
					|  |  |  | 			// Set to null so that selecting the same file will trigger the change event | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
										
									
								
							
						 
					 
				 
			
		
			
				
					
					
						
							
								
									
										
											
	
		
			
				
					|  |  | @ -20,9 +20,9 @@ | 
			
		
	
		
			
				
					|  |  |  | --> | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | <template> | 
			
		
	
		
			
				
					|  |  |  | 	<div class="wrapper"> | 
			
		
	
		
			
				
					|  |  |  | 	<div v-if="modal" class="wrapper"> | 
			
		
	
		
			
				
					|  |  |  | 		<!-- New group form --> | 
			
		
	
		
			
				
					|  |  |  | 		<NcModal v-if="modal && page !== 2" | 
			
		
	
		
			
				
					|  |  |  | 		<NcModal v-show=" page !== 2" | 
			
		
	
		
			
				
					|  |  |  | 			class="conversation-form" | 
			
		
	
		
			
				
					|  |  |  | 			:container="container" | 
			
		
	
		
			
				
					|  |  |  | 			@close="closeModal"> | 
			
		
	
	
		
			
				
					|  |  | @ -118,7 +118,7 @@ | 
			
		
	
		
			
				
					|  |  |  | 		</NcModal> | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | 		<!-- Third page : this is the confirmation page--> | 
			
		
	
		
			
				
					|  |  |  | 		<NcModal v-else-if="page === 2" | 
			
		
	
		
			
				
					|  |  |  | 		<NcModal v-if="page === 2" | 
			
		
	
		
			
				
					|  |  |  | 			:container="container" | 
			
		
	
		
			
				
					|  |  |  | 			@close="closeModal"> | 
			
		
	
		
			
				
					|  |  |  | 			<NcEmptyContent> | 
			
		
	
	
		
			
				
					|  |  | 
 |