[FIX] "Discussion" label in Sidebar not hidden (#14682)

RocketChat · Aug 20, 2019 · 880e38b · 880e38b
1 parent 429b1ee
commit 880e38b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/app/discussion/client/views/DiscussionList.html b/app/discussion/client/views/DiscussionList.html
@@ -1,10 +1,12 @@
 <template name="DiscussionList">
-	{{#if rooms}}
-		<h3 class="rooms-list__type">
-			{{_ "Discussions"}}
-		</h3>
-		<ul class="rooms-list__list">
-			{{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
-		</ul>
+	{{#if shouldAppear}}
+		{{#if rooms}}
+			<h3 class="rooms-list__type">
+				{{_ "Discussions"}}
+			</h3>
+			<ul class="rooms-list__list">
+				{{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
+			</ul>
+		{{/if}}
 	{{/if}}
 </template>
diff --git a/app/discussion/client/views/DiscussionList.js b/app/discussion/client/views/DiscussionList.js
@@ -26,4 +26,8 @@ Template.DiscussionList.helpers({
 		query.prid = { $exists: true };
 		return ChatSubscription.find(query, { sort });
 	},
+
+	shouldAppear() {
+		return settings.get('Discussion_enabled');
+	},
 });