Disabling Favorites based on settings.

RocketChat · Sep 25, 2015 · dd19e5c · dd19e5c
1 parent 51c242c
commit dd19e5c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
@@ -1,12 +1,19 @@
+isSubscribed = (_id) ->
+	return ChatSubscription.find({ rid: _id }).count() > 0
+
+favoritesEnabled = ->
+	return !RocketChat.settings.get 'Disable_Favorite_Rooms'
+
+
 # @TODO bug com o botão para "rolar até o fim" (novas mensagens) quando há uma mensagem com texto que gere rolagem horizontal
 Template.room.helpers
 	favorite: ->
 		sub = ChatSubscription.findOne { rid: this._id }, { fields: { f: 1 } }
-		return 'icon-star favorite-room' if sub?.f? and sub.f
+		return 'icon-star favorite-room' if sub?.f? and sub.f and favoritesEnabled
 		return 'icon-star-empty'
 
 	subscribed: ->
-		return ChatSubscription.find({ rid: this._id }).count() > 0
+		return isSubscribed(this._id)
 
 	messagesHistory: ->
 		return ChatMessage.find { rid: this._id, t: { '$ne': 't' }  }, { sort: { ts: 1 } }
@@ -231,6 +238,9 @@ Template.room.helpers
 	adminClass: ->
 		return 'admin' if RocketChat.authz.hasRole(Meteor.userId(), 'admin')
 
+	showToggleFavorite: ->
+		return true if isSubscribed(this._id) and favoritesEnabled()
+
 Template.room.events
 	"touchstart .message": (e, t) ->
 		message = this._arguments[1]

diff --git a/client/views/app/room.html b/client/views/app/room.html
@@ -9,7 +9,7 @@
 			<header class="fixed-title">
 				{{> burger}}
 				<h2>
-					{{#if subscribed}}
+					{{#if showToggleFavorite}}
 						<a href="#favorite" class="toggle-favorite"><i class="{{favorite}}"></i></a>
 					{{/if}}
 					<i class="{{roomIcon}} status-{{userStatus}}"></i>

diff --git a/client/views/app/sideNav/channels.coffee b/client/views/app/sideNav/channels.coffee
@@ -6,15 +6,22 @@ Template.channels.helpers
 		return 'active' if ChatSubscription.findOne({ t: { $in: ['c']}, f: { $ne: true }, open: true, rid: Session.get('openedRoom') }, { fields: { _id: 1 } })?
 
 	rooms: ->
-		return ChatSubscription.find { t: { $in: ['c']}, f: { $ne: true }, open: true }, { sort: 't': 1, 'name': 1 }
+		query =
+			t: { $in: ['c']},
+			open: true
+
+		if !RocketChat.settings.get 'Disable_Favorite_Rooms'
+			query.f = { $ne: true }
+
+		return ChatSubscription.find query, { sort: 't': 1, 'name': 1 }
 
 Template.channels.events
 	'click .add-room': (e, instance) ->
 		if RocketChat.authz.hasAtLeastOnePermission('create-c')
 			SideNav.setFlex "createChannelFlex"
 			SideNav.openFlex()
-		else 
-			e.preventDefault()	
+		else
+			e.preventDefault()
 
 	'click .more-channels': ->
 		SideNav.setFlex "listChannelsFlex"

diff --git a/client/views/app/sideNav/sideNav.coffee b/client/views/app/sideNav/sideNav.coffee
@@ -6,6 +6,8 @@ Template.sideNav.helpers
 		return SideNav.getFlex().data
 	footer: ->
 		return RocketChat.settings.get 'Layout_Sidenav_Footer'
+	showStarredRooms: ->
+		return !RocketChat.settings.get 'Disable_Favorite_Rooms'
 
 Template.sideNav.events
 	'click .close-flex': ->

diff --git a/client/views/app/sideNav/sideNav.html b/client/views/app/sideNav/sideNav.html
@@ -9,7 +9,9 @@
 			</div>
 			<div class="rooms-list">
 				<div class="wrapper">
-					{{> starredRooms }}
+					{{#if showStarredRooms }}
+						{{> starredRooms }}
+					{{/if}}
 					{{> channels }}
 					{{> directMessages }}
 					{{> privateGroups }}

diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
@@ -88,6 +88,7 @@
   "Delete" : "Delete",
   "Deleted" : "Deleted!",
   "Direct_Messages" : "Direct Messages",
+  "Disable_Favorite_Rooms" : "Disable Favorites",
   "Disable_New_Message_Notification" : "Disable New Message Notification",
   "Disable_New_Room_Notification" : "Disable New Room Notification",
   "Drop_to_upload_file" : "Drop to upload file",

diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
@@ -81,6 +81,7 @@
   "Delete" : "Deletar",
   "Deleted" : "Deletado!",
   "Direct_Messages" : "Mensagens Diretas",
+  "Disable_Favorite_Rooms" : "Desabilitar Favoritos",
   "Disable_New_Message_Notification" : "Desativar notificações de nova mensagem",
   "Disable_New_Room_Notification" : "Desativar notificações de nova sala",
   "Drop_to_upload_file" : "Largue para enviar arquivos",

diff --git a/packages/rocketchat-lib/settings/server/startup.coffee b/packages/rocketchat-lib/settings/server/startup.coffee
@@ -37,6 +37,7 @@ RocketChat.settings.add 'Accounts_OAuth_Twitter_secret', '', { type: 'string', g
 RocketChat.settings.addGroup 'General'
 RocketChat.settings.add 'Site_Name', 'Rocket.Chat', { type: 'string', group: 'General', public: true }
 RocketChat.settings.add 'Allow_Invalid_SelfSigned_Certs', false, { type: 'boolean', group: 'General' }
+RocketChat.settings.add 'Disable_Favorite_Rooms', false, { type: 'boolean', group: 'General' }
 
 RocketChat.settings.addGroup 'API'
 RocketChat.settings.add 'API_Analytics', '', { type: 'string', group: 'API', public: true }