Merge branch 'master' into 0.7.0

public/src/client/groups/list.js

@@ -39,12 +39,14 @@ define('forum/groups/list', function() {
 
 	Groups.search = function() {
 		var groupsEl = $('#groups-list'),
-			queryEl = $('#search-text');
+			queryEl = $('#search-text'),
+			sortEl = $('#search-sort');
 
 		socket.emit('groups.search', {
 			query: queryEl.val(),
 			options: {
-				expand: true
+				expand: true,
+				sort: sortEl.val()
 			}
 		}, function(err, groups) {
 			templates.parse('partials/groups/list', {

src/groups.js

@@ -892,8 +892,29 @@ var async = require('async'),
 				async.mapLimit(groupNames, 5, function(groupName, next) {
 					Groups.get(groupName, options || {}, next);
 				}, next);
-			}
+			},
+			async.apply(Groups.sort, options.sort)
 		], callback);
 	};
 
+	Groups.sort = function(strategy, groups, next) {
+		switch(strategy) {
+			case 'count':
+				groups = groups.sort(function(a, b) {
+					return a.slug > b.slug;
+				}).sort(function(a, b) {
+					return a.memberCount < b.memberCount;
+				});
+				break;
+
+			case 'alpha':	// intentional fall-through
+			default:
+				groups = groups.sort(function(a, b) {
+					return a.slug > b.slug;
+				});
+		}
+
+		next(null, groups);
+	};
+
 }(module.exports));