Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-31 13:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'soohwa-admin-create-user' into devel

Browse source 
REST API: Create user despite disabling registration.
Thanks to soohwa ! Closes #1232
This commit is contained in:
Lauri Ojansivu 2017-09-25 00:56:04 +03:00
commit 1dd66fdac2
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -4,14 +4,15 @@ This release adds the following new features:
* [Add translations (en/de/fi) for email notifications regarding checklists and checklist
items](https://github.com/wekan/wekan/pull/1238);
* [Added plus button to add card on top of the list](https://github.com/wekan/wekan/pull/1244).
* [Added plus button to add card on top of the list](https://github.com/wekan/wekan/pull/1244);
* [REST API: Create user despite disabling registration](https://github.com/wekan/wekan/issues/1232).
and fixes the following bugs:
* [Checklist items are lost when moving items to another checklist](https://github.com/wekan/wekan/pull/1240);
* [Keep state of checklist items when moved to another checklist](https://github.com/wekan/wekan/pull/1242).
Thanks to GitHub users GhassenRjab, mario-orlicky, umbertooo and xet7 for their contributions.
Thanks to GitHub users GhassenRjab, mario-orlicky, soohwa, umbertooo and xet7 for their contributions.
# v0.39 2017-09-18 Wekan release

14
models/users.js
View file

@ -108,6 +108,10 @@ Users.attachSchema(new SimpleSchema({
type: Boolean,
optional: true,
},
fromAdmin: {
type: Boolean,
optional: false,
},
}));
// Search a user in the complete server database by its name or username. This
@ -435,6 +439,12 @@ if (Meteor.isServer) {
user.isAdmin = true;
return user;
}
if (options.from === 'admin') {
user.fromAdmin = true;
return user;
}
const disableRegistration = Settings.findOne().disableRegistration;
if (!disableRegistration) {
return user;
@ -524,6 +534,9 @@ if (Meteor.isServer) {
Users.after.insert((userId, doc) => {
if (doc.fromAdmin)
return;
//invite user to corresponding boards
const disableRegistration = Settings.findOne().disableRegistration;
if (disableRegistration) {
@ -582,6 +595,7 @@ if (Meteor.isServer) {
username: req.body.username,
email: req.body.email,
password: 'default',
from: 'admin',
});
JsonRoutes.sendResult(res, {