Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pisns-forum-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
scrmGroup
pisns-forum-api
Commits
529d532b
Commit
529d532b
authored
Dec 17, 2015
by
杨翌文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
8336f4d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
forumInfo.js
app/controllers/mobile/forumInfo.js
+11
-12
forumThreadService.js
app/service/forumThreadService.js
+1
-1
No files found.
app/controllers/mobile/forumInfo.js
View file @
529d532b
...
@@ -167,18 +167,17 @@ router.get('/info/:fid/threads', function(req, res, next) {
...
@@ -167,18 +167,17 @@ router.get('/info/:fid/threads', function(req, res, next) {
if
(
fid
)
{
if
(
fid
)
{
async
.
waterfall
([
async
.
waterfall
([
function
(
callback
)
{
function
(
callback
)
{
callback
(
null
,
null
);
forumUserThreadControlService
.
getUserThreadControlById
(
user
.
getMobileUser
(
req
),
function
(
err
,
doc
)
{
// forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req), function(err, doc) {
if
(
err
)
{
// if (err) {
callback
(
err
,
null
);
// callback(err, null);
}
else
{
// } else {
if
(
doc
)
{
// if (doc) {
callback
(
null
,
doc
);
// callback(null, doc);
}
else
{
// } else {
callback
(
null
,
null
);
// callback(null, null);
}
// }
}
// }
});
// });
}
}
],
function
(
err
,
result
)
{
],
function
(
err
,
result
)
{
if
(
err
)
{
if
(
err
)
{
...
...
app/service/forumThreadService.js
View file @
529d532b
...
@@ -707,7 +707,7 @@ function getSubThreads(doc, sort, callback) {
...
@@ -707,7 +707,7 @@ function getSubThreads(doc, sort, callback) {
if
(
sort
)
{
if
(
sort
)
{
sortBy
=
sort
;
sortBy
=
sort
;
}
}
ForumThread
.
find
(
conditions
,
subThreadFields
).
populate
(
'from'
,
'icon'
).
sort
(
sortBy
).
exec
(
function
(
err
,
docs
)
{
ForumThread
.
find
(
conditions
).
populate
(
'from'
,
'icon'
).
sort
(
sortBy
).
exec
(
function
(
err
,
docs
)
{
if
(
err
)
{
if
(
err
)
{
console
.
error
(
err
);
console
.
error
(
err
);
callback
(
err
,
null
);
callback
(
err
,
null
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment