|
@@ -2,6 +2,8 @@ module.exports = function(crowi) {
|
|
|
var debug = require('debug')('crowi:models:comment')
|
|
var debug = require('debug')('crowi:models:comment')
|
|
|
, mongoose = require('mongoose')
|
|
, mongoose = require('mongoose')
|
|
|
, ObjectId = mongoose.Schema.Types.ObjectId
|
|
, ObjectId = mongoose.Schema.Types.ObjectId
|
|
|
|
|
+ , USER_PUBLIC_FIELDS = '_id fbId image googleId name usernmae email status createdAt' // TODO: どこか別の場所へ...
|
|
|
|
|
+ , commentSchema
|
|
|
;
|
|
;
|
|
|
|
|
|
|
|
commentSchema = new mongoose.Schema({
|
|
commentSchema = new mongoose.Schema({
|
|
@@ -45,7 +47,7 @@ module.exports = function(crowi) {
|
|
|
self
|
|
self
|
|
|
.find({page: id})
|
|
.find({page: id})
|
|
|
.sort({'createdAt': -1})
|
|
.sort({'createdAt': -1})
|
|
|
- .populate('creator')
|
|
|
|
|
|
|
+ .populate('creator', USER_PUBLIC_FIELDS)
|
|
|
.exec(function(err, data) {
|
|
.exec(function(err, data) {
|
|
|
if (err) {
|
|
if (err) {
|
|
|
return reject(err);
|
|
return reject(err);
|
|
@@ -68,7 +70,7 @@ module.exports = function(crowi) {
|
|
|
self
|
|
self
|
|
|
.find({revision: id})
|
|
.find({revision: id})
|
|
|
.sort({'createdAt': -1})
|
|
.sort({'createdAt': -1})
|
|
|
- .populate('creator')
|
|
|
|
|
|
|
+ .populate('creator', USER_PUBLIC_FIELDS)
|
|
|
.exec(function(err, data) {
|
|
.exec(function(err, data) {
|
|
|
if (err) {
|
|
if (err) {
|
|
|
return reject(err);
|
|
return reject(err);
|