diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:59:19 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:59:19 +0200 |
commit | cbc3c8224fbed643780c5be20221269b62e50ac6 (patch) | |
tree | 5715424ab1454463a3f8ca458729347bbc014f5b /config | |
parent | 7b68f1901e8bd81ec8fbebb60a3f4e057b57d06d (diff) | |
parent | 7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f (diff) | |
download | wekan-cbc3c8224fbed643780c5be20221269b62e50ac6.tar.gz wekan-cbc3c8224fbed643780c5be20221269b62e50ac6.tar.bz2 wekan-cbc3c8224fbed643780c5be20221269b62e50ac6.zip |
Merge branch 'lkisme-devel' into devel
Add Admin Panel:
1) Disable Self-Registration and invite users
2) SMTP settings.
Adding Admin user in mongo cli:
1) Use database that has wekan data, for example:
use admin;
2) Add Admin rights to some Wekan username:
db.users.update({username:'admin-username-here'},{$set:{isAdmin:true}})
Hiding Admin panel by removing Admin rights:
use admin;
db.settings.remove({});
Diffstat (limited to 'config')
-rw-r--r-- | config/accounts.js | 15 | ||||
-rw-r--r-- | config/router.js | 20 |
2 files changed, 31 insertions, 4 deletions
diff --git a/config/accounts.js b/config/accounts.js index 9ab26b33..51c0f49e 100644 --- a/config/accounts.js +++ b/config/accounts.js @@ -1,12 +1,21 @@ const passwordField = AccountsTemplates.removeField('password'); const emailField = AccountsTemplates.removeField('email'); + AccountsTemplates.addFields([{ _id: 'username', type: 'text', displayName: 'username', required: true, minLength: 2, -}, emailField, passwordField]); +}, emailField, passwordField, { + _id: 'invitationcode', + type: 'text', + displayName: 'Invitation Code', + required: false, + minLength: 6, + errStr: 'Invitation code doesn\'t exist', + template: 'invitationCode', +}]); AccountsTemplates.configure({ defaultLayout: 'userFormsLayout', @@ -48,9 +57,6 @@ AccountsTemplates.configureRoute('changePwd', { }); if (Meteor.isServer) { - if (process.env.MAIL_FROM) { - Accounts.emailTemplates.from = process.env.MAIL_FROM; - } ['resetPassword-subject', 'resetPassword-text', 'verifyEmail-subject', 'verifyEmail-text', 'enrollAccount-subject', 'enrollAccount-text'].forEach((str) => { const [templateName, field] = str.split('-'); @@ -63,3 +69,4 @@ if (Meteor.isServer) { }; }); } + diff --git a/config/router.js b/config/router.js index 7194621b..72592bd6 100644 --- a/config/router.js +++ b/config/router.js @@ -99,6 +99,26 @@ FlowRouter.route('/import', { }, }); +FlowRouter.route('/setting', { + name: 'setting', + triggersEnter: [ + AccountsTemplates.ensureSignedIn, + () => { + Session.set('currentBoard', null); + Session.set('currentCard', null); + + Filter.reset(); + EscapeActions.executeAll(); + }, + ], + action() { + BlazeLayout.render('defaultLayout', { + headerBar: 'settingHeaderBar', + content: 'setting', + }); + }, +}); + FlowRouter.notFound = { action() { BlazeLayout.render('defaultLayout', { content: 'notFound' }); |