github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

25
client/components/settings/peopleBody.js
View file

@ -558,6 +558,7 @@ Template.editUserPopup.events({
let userTeamsList = userTeams.split(",");
let userTeamsIdsList = userTeamsIds.split(",");
let userTms = [];
<<<<<<< HEAD
<<<<<<< HEAD
for(let i = 0; i < userTeamsList.length; i++){
userTms.push({
@ -566,6 +567,8 @@ Template.editUserPopup.events({
})
}
=======
=======
>>>>>>> feature/250f95de
if(userTeams != ''){
for(let i = 0; i < userTeamsList.length; i++){
userTms.push({
@ -575,6 +578,9 @@ Template.editUserPopup.events({
}
}
<<<<<<< HEAD
>>>>>>> feature/250f95de
=======
>>>>>>> feature/250f95de
Users.update(this.userId, {
$set:{
@ -585,6 +591,7 @@ Template.editUserPopup.events({
let userOrgsList = userOrgs.split(",");
let userOrgsIdsList = userOrgsIds.split(",");
let userOrganizations = [];
<<<<<<< HEAD
<<<<<<< HEAD
for(let i = 0; i < userOrgsList.length; i++){
userOrganizations.push({
@ -593,6 +600,8 @@ Template.editUserPopup.events({
})
}
=======
=======
>>>>>>> feature/250f95de
if(userOrgs != ''){
for(let i = 0; i < userOrgsList.length; i++){
userOrganizations.push({
@ -602,6 +611,9 @@ Template.editUserPopup.events({
}
}
<<<<<<< HEAD
>>>>>>> feature/250f95de
=======
>>>>>>> feature/250f95de
Users.update(this.userId, {
$set:{
@ -752,8 +764,12 @@ UpdateUserOrgsOrTeamsElement = function(isNewUser = false){
lstInputValuesIds = [];
}
index = lstInputValues.indexOf(selectedEltValue);
<<<<<<< HEAD
<<<<<<< HEAD
indexId = lstInputValuesIds.indexOf(selectedEltValue);
=======
indexId = lstInputValuesIds.indexOf(selectedEltValueId);
>>>>>>> feature/250f95de
=======
indexId = lstInputValuesIds.indexOf(selectedEltValueId);
>>>>>>> feature/250f95de
@ -915,7 +931,10 @@ Template.newUserPopup.events({
'click #addUserOrgNewUser'(event) {
event.preventDefault();
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> feature/250f95de
userOrgsTeamsAction = "addOrg";
document.getElementById("jsOrgsNewUser").style.display = 'block';
@ -960,7 +979,10 @@ Template.newUserPopup.events({
'click #removeUserOrgNewUser'(event) {
event.preventDefault();
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> feature/250f95de
if(Users.find({"orgs.orgId": this.orgId}).count() > 0)
{
let orgClassList = document.getElementById("deleteOrgWarningMessage").classList;
@ -1002,9 +1024,12 @@ Template.newUserPopup.events({
},
'change #jsTeamsNewUser'(event) {
event.preventDefault();
<<<<<<< HEAD
UpdateUserOrgsOrTeamsElement(true);
},
=======
=======
>>>>>>> feature/250f95de
if(Users.find({"teams.teamId": this.teamId}).count() > 0)
{
let teamClassList = document.getElementById("deleteTeamWarningMessage").classList;

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({