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

Merge remote-tracking branch 'origin/master' into Widgets

Browse Source
This commit is contained in:
psychobunny
2014-02-19 17:45:40 -05:00
parent 0963e62acb f50d77bca0
commit 163b0f964e
52 changed files with 283 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/admin.js
View File

@@ -318,7 +318,7 @@ var nconf = require('nconf'),
app.get('/categories/active', function (req, res) {
categories.getAllCategories(0, function (err, data) {
data.categories = data.categories.filter(function (category) {
return (!category.disabled || parseInt(category.disabled, 10) === 0);
return !category.disabled;
});
res.json(data);
});
@@ -327,7 +327,7 @@ var nconf = require('nconf'),
app.get('/categories/disabled', function (req, res) {
categories.getAllCategories(0, function (err, data) {
data.categories = data.categories.filter(function (category) {
return parseInt(category.disabled, 10) === 1;
return category.disabled;
});
res.json(data);
});
@@ -377,7 +377,10 @@ var nconf = require('nconf'),
if(err) {
return next(err);
}
res.json(200, {eventdata: data.toString()});
if(data) {
data = data.toString().split('\n').reverse().join('\n');
}
res.json(200, {eventdata: data});
});
});