From 9bb9ff615346c2d0c9c35609758bb5fc5c9da70b Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Sat, 25 Apr 2020 18:44:40 +0200 Subject: [PATCH] Update conversation members --- assets/js/components/conversations/chatWindows.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/js/components/conversations/chatWindows.js b/assets/js/components/conversations/chatWindows.js index 3cbcb773..803c459d 100644 --- a/assets/js/components/conversations/chatWindows.js +++ b/assets/js/components/conversations/chatWindows.js @@ -555,8 +555,9 @@ const ConvChatWindow = { //We disable name field settingsForm.conversationNameInput.disabled = "true"; - //We hide conversation users (presents in members pane) - settingsForm.usersElement.parentNode.style.display = "none"; + //We hide conversation users (presents in members pane - if user is not allowed to add new members) + if(!conversation.infos.canEveryoneAddMembers) + settingsForm.usersElement.parentNode.style.display = "none"; settingsForm.allowEveryoneToAddMembers.parentNode.parentNode.remove(); } @@ -616,14 +617,17 @@ const ConvChatWindow = { following: conversation.settingsForm.followConversationInput.checked, } + //Get conversation members + if(conversation.infos.ID_owner == userID() || conversation.infos.canEveryoneAddMembers) + newValues.members = ComunicWeb.components.userSelect.getResults(conversation.settingsForm.usersElement); + //Add other fields if the user is a conversation moderator if(conversation.infos.ID_owner == userID()){ //Specify conversation name var nameValue = conversation.settingsForm.conversationNameInput.value newValues.name = (nameValue === "" ? false : nameValue); - //Get conversation members - newValues.members = ComunicWeb.components.userSelect.getResults(conversation.settingsForm.usersElement); + //Check if any users were selected if(newValues.members.length === 0){