diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade index e985fb11f..09e850071 100644 --- a/client/components/settings/peopleBody.jade +++ b/client/components/settings/peopleBody.jade @@ -571,15 +571,16 @@ template(name="settingsUserPopup") a.impersonate-user i.fa.fa-user | {{_ 'impersonate-user'}} - //hr - //li - // form - // label.hide.userId(type="text" value=user._id) - // div.buttonsContainer - // input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}") - // Delete is not enabled yet, because it does leave empty user avatars + hr + li + form + label.hide.userId(type="text" value=user._id) + div.buttonsContainer + input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}") + // Delete is enabled, but there is still bug of leaving empty user avatars // to boards: boards members, card members and assignees have - // empty users. See: + // empty users. So it is better to remove user from all boards before removing user. + // See: // - wekan/client/components/settings/peopleBody.jade deleteButton // - wekan/client/components/settings/peopleBody.js deleteButton // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember' diff --git a/models/users.js b/models/users.js index acf82bcae..51cbb49d7 100644 --- a/models/users.js +++ b/models/users.js @@ -2065,16 +2065,18 @@ if (Meteor.isServer) { try { Authentication.checkUserId(req.userId); const id = req.params.userId; - // Delete is not enabled yet, because it does leave empty user avatars + // Delete user is enabled, but is still has bug of leaving empty user avatars // to boards: boards members, card members and assignees have - // empty users. See: + // empty users. So it would be better to delete user from all boards before + // deleting user. + // See: // - wekan/client/components/settings/peopleBody.jade deleteButton // - wekan/client/components/settings/peopleBody.js deleteButton // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember' // that does now remove member from board, card members and assignees correctly, // but that should be used to remove user from all boards similarly // - wekan/models/users.js Delete is not enabled - // Meteor.users.remove({ _id: id }); + Meteor.users.remove({ _id: id }); JsonRoutes.sendResult(res, { code: 200, data: {