|
@@ -11,7 +11,7 @@ module.exports = function(crowi) {
|
|
|
, STATUS_SUSPENDED = 3
|
|
, STATUS_SUSPENDED = 3
|
|
|
, STATUS_DELETED = 4
|
|
, STATUS_DELETED = 4
|
|
|
, STATUS_INVITED = 5
|
|
, STATUS_INVITED = 5
|
|
|
- , USER_PUBLIC_FIELDS = '_id image isGravaterEnabled googleId name username email introduction status lang createdAt admin' // TODO: どこか別の場所へ...
|
|
|
|
|
|
|
+ , USER_PUBLIC_FIELDS = '_id image isGravatarEnabled googleId name username email introduction status lang createdAt admin' // TODO: どこか別の場所へ...
|
|
|
|
|
|
|
|
, LANG_EN = 'en'
|
|
, LANG_EN = 'en'
|
|
|
, LANG_EN_US = 'en-US'
|
|
, LANG_EN_US = 'en-US'
|
|
@@ -27,7 +27,7 @@ module.exports = function(crowi) {
|
|
|
userSchema = new mongoose.Schema({
|
|
userSchema = new mongoose.Schema({
|
|
|
userId: String,
|
|
userId: String,
|
|
|
image: String,
|
|
image: String,
|
|
|
- isGravaterEnabled: { type: Boolean, default: false },
|
|
|
|
|
|
|
+ isGravatarEnabled: { type: Boolean, default: false },
|
|
|
googleId: String,
|
|
googleId: String,
|
|
|
name: { type: String },
|
|
name: { type: String },
|
|
|
username: { type: String, index: true },
|
|
username: { type: String, index: true },
|
|
@@ -138,8 +138,8 @@ module.exports = function(crowi) {
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- userSchema.methods.updateIsGravaterEnabled = function(isGravaterEnabled, callback) {
|
|
|
|
|
- this.isGravaterEnabled = isGravaterEnabled;
|
|
|
|
|
|
|
+ userSchema.methods.updateIsGravatarEnabled = function(isGravatarEnabled, callback) {
|
|
|
|
|
+ this.isGravatarEnabled = isGravatarEnabled;
|
|
|
this.save(function(err, userData) {
|
|
this.save(function(err, userData) {
|
|
|
return callback(err, userData);
|
|
return callback(err, userData);
|
|
|
});
|
|
});
|
|
@@ -581,7 +581,7 @@ module.exports = function(crowi) {
|
|
|
|
|
|
|
|
newUser.email = email;
|
|
newUser.email = email;
|
|
|
newUser.setPassword(password);
|
|
newUser.setPassword(password);
|
|
|
- newUser.isGravaterEnabled = true; // Gravater enabled in default
|
|
|
|
|
|
|
+ newUser.isGravatarEnabled = true; // Gravatar enabled in default
|
|
|
newUser.createdAt = Date.now();
|
|
newUser.createdAt = Date.now();
|
|
|
newUser.status = STATUS_INVITED;
|
|
newUser.status = STATUS_INVITED;
|
|
|
|
|
|
|
@@ -658,7 +658,7 @@ module.exports = function(crowi) {
|
|
|
newUser.email = email;
|
|
newUser.email = email;
|
|
|
newUser.setPassword(password);
|
|
newUser.setPassword(password);
|
|
|
newUser.lang = lang;
|
|
newUser.lang = lang;
|
|
|
- newUser.isGravaterEnabled = true; // Gravater enabled in default
|
|
|
|
|
|
|
+ newUser.isGravatarEnabled = true; // Gravatar enabled in default
|
|
|
newUser.createdAt = Date.now();
|
|
newUser.createdAt = Date.now();
|
|
|
newUser.status = decideUserStatusOnRegistration();
|
|
newUser.status = decideUserStatusOnRegistration();
|
|
|
|
|
|