From 995e1cdc1cf48aaede132ec3fef4cbd65c6070f1 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Tue, 22 Oct 2019 14:31:58 -0300
Subject: [PATCH] fix password on private channels

---
 app/channel-settings/client/views/channelSettings.html | 2 ++
 app/channel-settings/client/views/channelSettings.js   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/channel-settings/client/views/channelSettings.html b/app/channel-settings/client/views/channelSettings.html
index 9d6f3b23f757..a9acf114fb8a 100644
--- a/app/channel-settings/client/views/channelSettings.html
+++ b/app/channel-settings/client/views/channelSettings.html
@@ -217,6 +217,7 @@
 			{{/if}}
 		{{/with}}
 		{{#with settings.joinCode}}
+			{{#if canView}}
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-input">
 					<label class="rc-input__label">
@@ -227,6 +228,7 @@
 					</label>
 				</div>
 			</div>
+			{{/if}}
 		{{/with}}
 
 		{{#if hasRetentionPermission}}
diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
index 41332e2aa06b..48bc24827424 100644
--- a/app/channel-settings/client/views/channelSettings.js
+++ b/app/channel-settings/client/views/channelSettings.js
@@ -493,7 +493,7 @@ Template.channelSettingsEditing.onCreated(function() {
 			showingValue: new ReactiveVar(false),
 			realValue: null,
 			canView() {
-				return roomTypes.roomTypes[room.t].allowRoomSettingChange(room, RoomSettingsEnum.JOIN_CODE) && hasAllPermission('edit-room', room._id);
+				return room.t !== 'p' && roomTypes.roomTypes[room.t].allowRoomSettingChange(room, RoomSettingsEnum.JOIN_CODE) && hasAllPermission('edit-room', room._id);
 			},
 			canEdit() {
 				return hasAllPermission('edit-room', room._id);