Skip to content

P
pisns-forum-api
Commit 4c5d9710 authored by strong's avatar strong
Browse files
Options

Merge commit '6c5f284d' into SANDBOX

parents 45f460af 6c5f284d
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
app/controllers/mobile/forumInfo.js
View file @ 4c5d9710
......@@ -100,7 +100,7 @@ router.get('/info/:fid/get', function(req, res, next) {
res.json(returnCode.BUSY);
} else {
var rs = {};
rs.data = results[0];
rs.data = results[0].toObject();
rs.data.threadCount = results[1];
res.json(_.assign(rs, returnCode.SUCCESS));
}
......@@ -167,18 +167,17 @@ router.get('/info/:fid/threads', function(req, res, next) {
if (fid) {
async.waterfall([
function(callback) {
forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req), function(err, doc) {
if (err) {
callback(err, null);
} else {
if (doc) {
callback(null, doc);
} else {
callback(null, null);
// forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req), function(err, doc) {
// if (err) {
// callback(err, null);
// } else {
// if (doc) {
// callback(null, doc);
// } else {
// callback(null, null);
// }
// }
// });
}
}
});
}
], function(err, result) {
if (err) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment