Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 12:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/atomoc/NodeBB

Browse Source
This commit is contained in:
Сергей Савельев
2015-04-01 15:11:19 +03:00
parent 621ae9c91a 63db2a539e
commit 18c5354ec7
42 changed files with 256 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/controllers/admin.js
View File

@@ -150,11 +150,10 @@ adminController.categories.get = function(req, res, next) {
};
adminController.categories.getAll = function(req, res, next) {
var uid = req.user ? parseInt(req.user.uid, 10) : 0,
active = [],
var active = [],
disabled = [];
categories.getAllCategories(uid, function (err, categoryData) {
categories.getAllCategories(req.uid, function (err, categoryData) {
if (err) {
return next(err);
}
@@ -191,20 +190,20 @@ adminController.flags.get = function(req, res, next) {
if (err) {
return next(err);
}
res.render('admin/manage/flags', {posts: posts, next: end + 1, byUsername: byUsername});
res.render('admin/manage/flags', {posts: posts, next: stop + 1, byUsername: byUsername});
}
var uid = req.user ? parseInt(req.user.uid, 10) : 0;
var sortBy = req.query.sortBy || 'count';
var byUsername = req.query.byUsername || '';
var start = 0;
var end = 19;
var stop = 19;
if (byUsername) {
posts.getUserFlags(byUsername, sortBy, uid, start, end, done);
posts.getUserFlags(byUsername, sortBy, req.uid, start, stop, done);
} else {
var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
posts.getFlags(set, uid, start, end, done);
}
posts.getFlags(set, req.uid, start, stop, done);
}
};
adminController.database.get = function(req, res, next) {
@@ -273,7 +272,7 @@ adminController.navigation.get = function(req, res, next) {
if (err) {
return next(err);
}
res.render('admin/general/navigation', data);
});
};
@@ -386,7 +385,7 @@ adminController.extend.rewards = function(req, res, next) {
if (err) {
return next(err);
}
res.render('admin/extend/rewards', data);
});
};