summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/components/settings/peopleBody.jade5
-rw-r--r--client/components/settings/peopleBody.js9
-rw-r--r--client/components/settings/peopleBody.styl12
-rw-r--r--client/components/users/userHeader.jade5
-rw-r--r--client/components/users/userHeader.js5
-rw-r--r--models/users.js28
6 files changed, 62 insertions, 2 deletions
diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index 4dca5cb1..15deb005 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -107,5 +107,8 @@ template(name="editUserPopup")
label
| {{_ 'password'}}
input.js-profile-password(type="password")
+ div.buttonsContainer
+ input.primary.wide(type="submit" value="{{_ 'save'}}")
+ div
+ input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
- input.primary.wide(type="submit" value="{{_ 'save'}}")
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js
index 3ec96bb0..83cf14fa 100644
--- a/client/components/settings/peopleBody.js
+++ b/client/components/settings/peopleBody.js
@@ -98,6 +98,7 @@ Template.peopleRow.helpers({
Template.editUserPopup.onCreated(function() {
this.authenticationMethods = new ReactiveVar([]);
+ this.errorMessage = new ReactiveVar('');
Meteor.call('getAuthenticationsEnabled', (_, result) => {
if (result) {
@@ -129,6 +130,9 @@ Template.editUserPopup.helpers({
const selected = Users.findOne(userId).authenticationMethod;
return selected === 'ldap';
},
+ errorMessage() {
+ return Template.instance().errorMessage.get();
+ },
});
BlazeComponent.extendComponent({
@@ -220,4 +224,9 @@ Template.editUserPopup.events({
});
} else Popup.close();
},
+
+ 'click #deleteButton'() {
+ Users.remove(this.userId);
+ Popup.close();
+ },
});
diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl
index b98c5340..80387611 100644
--- a/client/components/settings/peopleBody.styl
+++ b/client/components/settings/peopleBody.styl
@@ -34,3 +34,15 @@ table
button
min-width: 60px;
+
+.content-wrapper
+ margin-top: 10px
+
+.buttonsContainer
+ display: flex
+
+ input
+ margin: 0
+
+ div
+ margin: auto
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index c55b65c2..2a3d04cc 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -53,7 +53,10 @@ template(name="editProfilePopup")
input.js-profile-email(type="email" value="{{emails.[0].address}}")
else
input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
- input.primary.wide(type="submit" value="{{_ 'save'}}")
+ div.buttonsContainer
+ input.primary.wide(type="submit" value="{{_ 'save'}}")
+ div
+ input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
template(name="changePasswordPopup")
+atForm(state='changePwd')
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 6a2397a4..869c9d15 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -95,6 +95,11 @@ Template.editProfilePopup.events({
});
} else Popup.back();
},
+ 'click #deleteButton'() {
+ Users.remove(Meteor.userId());
+ Popup.close();
+ AccountsTemplates.logout();
+ },
});
// XXX For some reason the useraccounts autofocus isnt working in this case.
diff --git a/models/users.js b/models/users.js
index 0dd9c1d6..c2687e35 100644
--- a/models/users.js
+++ b/models/users.js
@@ -238,6 +238,19 @@ Users.allow({
const user = Users.findOne(userId);
return user && Meteor.user().isAdmin;
},
+ remove(userId, doc) {
+ const adminsNumber = Users.find({ isAdmin: true }).count();
+ const { isAdmin } = Users.findOne({ _id: userId }, { fields: { 'isAdmin': 1 } });
+
+ // Prevents remove of the only one administrator
+ if (adminsNumber === 1 && isAdmin && userId === doc._id) {
+ return false;
+ }
+
+ // If it's the user or an admin
+ return userId === doc._id || isAdmin;
+ },
+ fetch: [],
});
// Search a user in the complete server database by its name or username. This
@@ -364,6 +377,10 @@ Users.helpers({
getTemplatesBoardSlug() {
return Boards.findOne(this.profile.templatesBoardId).slug;
},
+
+ remove() {
+ User.remove({ _id: this._id});
+ },
});
Users.mutations({
@@ -673,6 +690,17 @@ if (Meteor.isServer) {
}, {unique: true});
});
+ Users.before.remove((userId, doc) => {
+ Boards
+ .find({members: {$elemMatch: {userId: doc._id, isAdmin: true}}})
+ .forEach((board) => {
+ // If only one admin for the board
+ if (board.members.filter((e) => e.isAdmin).length === 1) {
+ Boards.remove(board._id);
+ }
+ });
+ });
+
// Each board document contains the de-normalized number of users that have
// starred it. If the user star or unstar a board, we need to update this
// counter.