From ffb906fa5de76e8ffedcdba9b88fa09c55509fdb Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Mon, 22 Jun 2015 18:59:14 -0300
Subject: [PATCH] removing need to count rooms

---
 client/views/app/sideNav/channels.coffee      |  3 ---
 client/views/app/sideNav/channels.html        | 17 +++++++----------
 .../views/app/sideNav/directMessages.coffee   |  2 --
 client/views/app/sideNav/directMessages.html  | 19 +++++++++----------
 client/views/app/sideNav/privateGroups.coffee |  3 +--
 client/views/app/sideNav/privateGroups.html   | 18 +++++++-----------
 6 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/client/views/app/sideNav/channels.coffee b/client/views/app/sideNav/channels.coffee
index 59896c8fe3b..5d5bc4e0163 100644
--- a/client/views/app/sideNav/channels.coffee
+++ b/client/views/app/sideNav/channels.coffee
@@ -5,9 +5,6 @@ Template.channels.helpers
 	rooms: ->
 		return ChatSubscription.find { t: { $in: ['c']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 }
 
-	total: ->
-		return ChatSubscription.find({ t: { $in: ['c']}, f: { $ne: true } }).count()
-
 Template.channels.events
 	'click .add-room': (e, instance) ->
 		SideNav.setFlex "createChannelFlex"
diff --git a/client/views/app/sideNav/channels.html b/client/views/app/sideNav/channels.html
index 804fc9ae3ff..d8dde6a7226 100644
--- a/client/views/app/sideNav/channels.html
+++ b/client/views/app/sideNav/channels.html
@@ -3,15 +3,12 @@
 		{{_ "Channels"}}
 		<i class="a-plus"></i>
 	</h3>
-	{{#if total}}
-		<ul>
-			{{#each rooms}}
-				{{> chatRoomItem }}
-			{{/each}}
-		</ul>
-	{{else}}
-		<p class="empty">{{_ "No_channels_yet" }}</p>
-	{{/if}}
-
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{else}}
+			<p class="empty">{{_ "No_channels_yet" }}</p>
+		{{/each}}
+	</ul>
 	<a href="" class="more more-channels">{{_ "More_channels"}} ..</a>
 </template>
diff --git a/client/views/app/sideNav/directMessages.coffee b/client/views/app/sideNav/directMessages.coffee
index ae604bae529..f948a98497e 100644
--- a/client/views/app/sideNav/directMessages.coffee
+++ b/client/views/app/sideNav/directMessages.coffee
@@ -1,5 +1,3 @@
 Template.directMessages.helpers
 	rooms: ->
 		return ChatSubscription.find { t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 }
-	total: ->
-		return ChatSubscription.find({ t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 }).fetch().length
diff --git a/client/views/app/sideNav/directMessages.html b/client/views/app/sideNav/directMessages.html
index 68c7afa62bd..2687a550035 100644
--- a/client/views/app/sideNav/directMessages.html
+++ b/client/views/app/sideNav/directMessages.html
@@ -1,14 +1,13 @@
 <template name="directMessages">
-	<h3>
+	<h3 class="add-room">
 		{{_ "Direct_Messages"}}
+		<i class="a-plus"></i>
 	</h3>
-	{{#if total}}
-		<ul>
-			{{#each rooms}}
-				{{> chatRoomItem }}
-			{{/each}}
-		</ul>
-	{{else}}
-		<p class="empty">{{_ "No_direct_messages_yet" }}</p>
-	{{/if}}
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{else}}
+			<p class="empty">{{_ "No_direct_messages_yet" }}</p>
+		{{/each}}
+	</ul>
 </template>
diff --git a/client/views/app/sideNav/privateGroups.coffee b/client/views/app/sideNav/privateGroups.coffee
index d5579a28fcc..a671c809899 100644
--- a/client/views/app/sideNav/privateGroups.coffee
+++ b/client/views/app/sideNav/privateGroups.coffee
@@ -1,10 +1,9 @@
 Template.privateGroups.helpers
 	tRoomMembers: ->
 		return t('Members_placeholder')
+
 	rooms: ->
 		return ChatSubscription.find { t: { $in: ['p']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 }
-	total: ->
-		return ChatSubscription.find({ t: { $in: ['p']}, f: { $ne: true } }).count()
 
 Template.privateGroups.events
 	'click .add-room': (e, instance) ->
diff --git a/client/views/app/sideNav/privateGroups.html b/client/views/app/sideNav/privateGroups.html
index 4d5ac7a340a..0574bf7c08f 100644
--- a/client/views/app/sideNav/privateGroups.html
+++ b/client/views/app/sideNav/privateGroups.html
@@ -3,15 +3,11 @@
 		{{_ "Private_Groups"}}
 		<i class="a-plus"></i>
 	</h3>
-	{{#if total}}
-		<ul>
-			{{#each rooms}}
-				{{> chatRoomItem }}
-			{{/each}}
-		</ul>
-	{{else}}
-		<p class="empty">{{_ "No_groups_yet" }}</p>
-	{{/if}}
-
-
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{else}}
+			<p class="empty">{{_ "No_groups_yet" }}</p>
+		{{/each}}
+	</ul>
 </template>