Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-20 16:26:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

merge of two branchs

Browse source
This commit is contained in:
Emile NDAGIJIMANA 2021-06-14 15:38:15 +02:00
commit 90139b978c
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
models/users.js
View file

@ -987,6 +987,7 @@ if (Meteor.isServer) {
check(userOrgsArray, Array);
check(userTeamsArray, Array);
if (Meteor.user() && Meteor.user().isAdmin) {
<<<<<<< HEAD
<<<<<<< HEAD
check(fullname, String);
check(username, String);
@ -999,6 +1000,8 @@ if (Meteor.isServer) {
check(userOrgsArray, Array);
check(userTeamsArray, Array);
=======
>>>>>>> feature/250f95de
=======
>>>>>>> feature/250f95de
const nUsersWithUsername = Users.find({