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
e87edd9f
Commit
e87edd9f
authored
Jan 11, 2016
by
strong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix_0111_comment_time' into SANDBOX
# Conflicts: # app/models/forumThread.js
parents
f50f72bd
a4ecb108
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
forumThread.js
app/models/forumThread.js
+4
-4
forumCommentService.js
app/service/forumCommentService.js
+2
-1
No files found.
app/models/forumThread.js
View file @
e87edd9f
...
...
@@ -118,10 +118,6 @@ var ForumThreadSchema = new Schema({
require
:
true
,
default
:
100
},
favor_by
:
[{
//被收藏用户列表
type
:
Schema
.
Types
.
ObjectId
,
ref
:
'ForumUser'
}],
new_recommend
:
{
//推荐 0否,1是
type
:
Number
,
require
:
true
,
...
...
@@ -130,6 +126,10 @@ var ForumThreadSchema = new Schema({
new_recommend_time
:{
//推荐时间
type
:
Date
},
favor_by
:
[{
//被收藏用户列表
type
:
Schema
.
Types
.
ObjectId
,
ref
:
'ForumUser'
}],
isEvent
:{
//是否活动 0否 1是
type
:
Number
,
require
:
true
,
...
...
app/service/forumCommentService.js
View file @
e87edd9f
...
...
@@ -12,7 +12,8 @@ var listCommentFields = {
praise_count
:
1
,
comment_count
:
1
,
comments
:
1
,
status
:
1
status
:
1
,
created
:
1
};
...
...
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