Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-02 22:51:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

wording change, email sending optimization, add texts to i18n

Browse source
This commit is contained in:
lkisme 2017-02-26 21:11:15 +08:00
parent e3c3cc0d8d
commit 39f2837838
9 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/settings.js
View file

@ -1,7 +1,7 @@
Settings = new Mongo.Collection('settings');
Settings.attachSchema(new SimpleSchema({
strict: {
disableRegistration: {
type: Boolean,
},
'mailServer.username': {
@ -23,7 +23,7 @@ Settings.attachSchema(new SimpleSchema({
'mailServer.from': {
type: String,
optional: true,
defaultValue: 'Kanban',
defaultValue: 'Wekan',
},
createdAt: {
type: Date,
@ -56,7 +56,7 @@ if (Meteor.isServer) {
const setting = Settings.findOne({});
if(!setting){
const now = new Date();
const defaultSetting = {strict: false, mailServer: {
const defaultSetting = {disableRegistration: false, mailServer: {
username: '', password:'', host: '', port:'', from: '',
}, createdAt: now, modifiedAt: now};
Settings.insert(defaultSetting);

10
models/users.js
View file

@ -348,7 +348,7 @@ if (Meteor.isServer) {
if (user._id === inviter._id) throw new Meteor.Error('error-user-notAllowSelf');
} else {
if (posAt <= 0) throw new Meteor.Error('error-user-doesNotExist');
if (Settings.findOne().strict) throw new Meteor.Error('error-user-notCreated');
if (Settings.findOne().disableRegistration) throw new Meteor.Error('error-user-notCreated');
const email = username;
username = email.substring(0, posAt);
const newUserId = Accounts.createUser({ username, email });
@ -395,8 +395,8 @@ if (Meteor.isServer) {
user.isAdmin = true;
return user;
}
const strict = Settings.findOne().strict;
if (!strict) {
const disableRegistration = Settings.findOne().disableRegistration;
if (!disableRegistration) {
return user;
}
@ -484,8 +484,8 @@ if (Meteor.isServer) {
Users.after.insert((userId, doc) => {
//invite user to corresponding boards
const strict = Settings.findOne().strict;
if (strict) {
const disableRegistration = Settings.findOne().disableRegistration;
if (disableRegistration) {
const user = Users.findOne(doc._id);
const invitationCode = InvitationCodes.findOne({code: user.profile.icode, valid:true});
if (!invitationCode) {