mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-02 03:55:55 +01:00
removed sort by username
This commit is contained in:
@@ -147,7 +147,7 @@ define('forum/users', ['translator'], function(translator) {
|
|||||||
|
|
||||||
|
|
||||||
function loadPage(page) {
|
function loadPage(page) {
|
||||||
socket.emit('user.loadPage', {page: page, sortBy: $('.search select').val(), onlineOnly: $('.search .online-only').is(':checked')}, function(err, data) {
|
socket.emit('user.loadSearchPage', {page: page, onlineOnly: $('.search .online-only').is(':checked')}, function(err, data) {
|
||||||
resetSearchNotify();
|
resetSearchNotify();
|
||||||
if (err) {
|
if (err) {
|
||||||
return app.alertError(err.message);
|
return app.alertError(err.message);
|
||||||
|
|||||||
@@ -454,8 +454,6 @@ SocketUser.loadPage = function(socket, data, callback) {
|
|||||||
var startTime = process.hrtime();
|
var startTime = process.hrtime();
|
||||||
var controllers = require('../controllers/users');
|
var controllers = require('../controllers/users');
|
||||||
var pagination = require('../pagination');
|
var pagination = require('../pagination');
|
||||||
var set = '';
|
|
||||||
data.sortBy = data.sortBy || 'joindate';
|
|
||||||
|
|
||||||
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
|
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
|
||||||
var start = Math.max(0, data.page - 1) * resultsPerPage;
|
var start = Math.max(0, data.page - 1) * resultsPerPage;
|
||||||
@@ -470,23 +468,6 @@ SocketUser.loadPage = function(socket, data, callback) {
|
|||||||
db.sortedSetCount('users:online', now - 300000, now, next);
|
db.sortedSetCount('users:online', now - 300000, now, next);
|
||||||
}
|
}
|
||||||
}, done);
|
}, done);
|
||||||
} else if (data.sortBy === 'username') {
|
|
||||||
async.parallel({
|
|
||||||
count: function(next) {
|
|
||||||
db.sortedSetCard('username:sorted', next);
|
|
||||||
},
|
|
||||||
users: function(next) {
|
|
||||||
db.getSortedSetRangeByLex('username:sorted', '-', '+', start, stop - start + 1, function(err, result) {
|
|
||||||
if (err) {
|
|
||||||
return next(err);
|
|
||||||
}
|
|
||||||
var uids = result.map(function(user) {
|
|
||||||
return user && user.split(':')[1];
|
|
||||||
});
|
|
||||||
user.getUsers(uids, socket.uid, next);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, done);
|
|
||||||
} else {
|
} else {
|
||||||
controllers.getUsersAndCount('users:joindate', socket.uid, start, stop, done);
|
controllers.getUsersAndCount('users:joindate', socket.uid, start, stop, done);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user