Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-29 21:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

confilcts resolved for Addressed one of the point cited in issue #802 'Assigning a user to a team or organization

Browse source
This commit is contained in:
Emile NDAGIJIMANA 2021-06-10 18:27:27 +02:00
parent 8607a18a26
commit 688ef08cd5
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,9 @@ BlazeComponent.extendComponent({
]; ];
}, },
filterPeople() { filterPeople() {
const value = $('#searchInput').first().val(); const value = $('#searchInput')
.first()
.val();
if (value === '') { if (value === '') {
this.findUsersOptions.set({}); this.findUsersOptions.set({});
} else { } else {
@ -513,18 +515,24 @@ Template.editUserPopup.events({
const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim(); const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim();
const isActive = templateInstance.find('.js-profile-isactive').value.trim(); const isActive = templateInstance.find('.js-profile-isactive').value.trim();
const email = templateInstance.find('.js-profile-email').value.trim(); const email = templateInstance.find('.js-profile-email').value.trim();
const verified = templateInstance.find('.js-profile-email-verified').value.trim(); const verified = templateInstance
const authentication = templateInstance.find('.js-authenticationMethod').value.trim(); .find('.js-profile-email-verified')
const importUsernames = templateInstance.find('.js-import-usernames').value.trim(); .value.trim();
const userOrgs = templateInstance.find('.js-userOrgs').value.trim(); const authentication = templateInstance
const userOrgsIds = templateInstance.find('.js-userOrgIds').value.trim(); .find('.js-authenticationMethod')
const userTeams = templateInstance.find('.js-userteams').value.trim(); .value.trim();
const userTeamsIds = templateInstance.find('.js-userteamIds').value.trim(); const importUsernames = templateInstance
.find('.js-import-usernames')
.value.trim();
const isChangePassword = password.length > 0; const isChangePassword = password.length > 0;
const isChangeUserName = username !== user.username; const isChangeUserName = username !== user.username;
const isChangeInitials = initials.length > 0; const isChangeInitials = initials.length > 0;
const isChangeEmailVerified = verified !== user.emails[0].verified; const isChangeEmailVerified = verified !== user.emails[0].verified;
const userOrgs = templateInstance.find('.js-userOrgs').value.trim();
const userOrgsIds = templateInstance.find('.js-userOrgIds').value.trim();
const userTeams = templateInstance.find('.js-userteams').value.trim();
const userTeamsIds = templateInstance.find('.js-userteamIds').value.trim();
// If previously email address has not been set, it is undefined, // If previously email address has not been set, it is undefined,
// check for undefined, and allow adding email address. // check for undefined, and allow adding email address.
@ -882,10 +890,6 @@ Template.newUserPopup.events({
}, },
'click #removeUserOrgNewUser'(event) { 'click #removeUserOrgNewUser'(event) {
event.preventDefault(); event.preventDefault();
Org.remove(this.orgId);
Popup.close();
}
});
userOrgsTeamsAction = "removeOrg"; userOrgsTeamsAction = "removeOrg";
document.getElementById("jsOrgsNewUser").style.display = 'block'; document.getElementById("jsOrgsNewUser").style.display = 'block';