From 4d87f0276bfe0eed7e9d3cca5d552c948e48e1c5 Mon Sep 17 00:00:00 2001 From: HSam Date: Thu, 3 Mar 2016 21:09:44 -0600 Subject: [PATCH] In the process of adding the delete button to the invitation panel. Apparently, the delete method doesn't work with the invitation items, so I might need to add some extra logic. --- public/src/admin/manage/registration.js | 18 ++++++++++++++++++ src/socket.io/admin/user.js | 6 +++++- src/user/invite.js | 1 + src/views/admin/manage/registration.tpl | 13 +++++++++---- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/public/src/admin/manage/registration.js b/public/src/admin/manage/registration.js index 0592fc02a9..981f1e812c 100644 --- a/public/src/admin/manage/registration.js +++ b/public/src/admin/manage/registration.js @@ -22,6 +22,24 @@ define('admin/manage/registration', function() { }); return false; }); + + $('.invites-list').on('click', '[data-action]', function(ev) { + var $this = this; + var parent = $(this).parents('[data-invitation-mail]'); + var email = parent.attr('data-invitation-mail'); + var action = $(this).attr('data-action'); + var method = 'admin.user.deleteInvitation'; + + if (action === 'delete') { + socket.emit(method, {email: email}, function(err) { + if (err) { + return app.alertError(err.message); + } + parent.remove(); + }); + } + return false; + }); }; return Registration; diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index a241affb90..4597314ee1 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -212,6 +212,10 @@ User.search = function(socket, data, callback) { }); }; +User.deleteInvitation = function(socket, data, callback) { + user.deleteInvitation(data.email, callback); +}; + User.acceptRegistration = function(socket, data, callback) { user.acceptRegistration(data.username, callback); }; @@ -221,4 +225,4 @@ User.rejectRegistration = function(socket, data, callback) { }; -module.exports = User; \ No newline at end of file +module.exports = User; diff --git a/src/user/invite.js b/src/user/invite.js index 638432e810..99194100e3 100644 --- a/src/user/invite.js +++ b/src/user/invite.js @@ -122,6 +122,7 @@ module.exports = function(User) { User.deleteInvitation = function(email, callback) { callback = callback || function() {}; + console.log('invitation:email:' + email); db.delete('invitation:email:' + email, callback); }; diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl index 278ba279b1..a3a8e2f905 100644 --- a/src/views/admin/manage/registration.tpl +++ b/src/views/admin/manage/registration.tpl @@ -66,18 +66,23 @@

The username will be displayed to the right of the emails for users who have redeemed their invitations.

- +
- - + + + - +
Inviter Username Invitee Email Invitee Username (if registered)
{invites.username} {invites.invitations.email}{invites.invitations.username}{invites.invitations.username} +
+ +
+