Don't adapt sorting on the client side

redlink-gmbh · Nov 24, 2017 · 9b71b62 · 9b71b62
1 parent 00e4bb5
commit 9b71b62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/packages/rocketchat-authorization/client/views/permissions.js
@@ -15,11 +15,7 @@ Template.permissions.helpers({
 	},
 
 	settingPermissions() {
-		return SettingPermissions.find({}, {
-			sort: {
-				_id: 1
-			}
-		});
+		return SettingPermissions.find();
 	},
 
 	hasPermission() {

diff --git a/packages/rocketchat-authorization/server/publications/permissions.js b/packages/rocketchat-authorization/server/publications/permissions.js
@@ -28,7 +28,7 @@ Meteor.methods({
 		const records = RocketChat.models.Permissions.find({
 			level: permissionLevel.SETTING,
 			groupPermissionId: {$exists: true} //filter group permissions themselves, as they are being assigned implicitly
-		}, {}, {sort: {group: 1, section: 1}}).fetch();
+		}, {}, {sort: {group: 1, section: 1, sorter: 1}}).fetch();
 
 		if (updatedAt instanceof Date) {
 			return {