diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js index c1377849a7f..414936be91e 100644 --- a/app/assets/javascripts/admin/models/admin_user.js +++ b/app/assets/javascripts/admin/models/admin_user.js @@ -228,6 +228,9 @@ Discourse.AdminUser.reopenClass({ user.set('can_approve', false); return user.set('selected', false); }); + + bootbox.alert(Em.String.i18n("admin.user.approve_bulk_success")); + return Discourse.ajax("/admin/users/approve-bulk", { type: 'PUT', data: { diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars index ac283ddbeac..ab3d9c23ba5 100644 --- a/app/assets/javascripts/admin/templates/user.js.handlebars +++ b/app/assets/javascripts/admin/templates/user.js.handlebars @@ -59,11 +59,15 @@
- {{#if can_approve}} - + {{#if approved}} + {{i18n admin.user.approve_success}} + {{else}} + {{#if can_approve}} + + {{/if}} {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index cd91d85a2d0..cfca2cf8294 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1131,6 +1131,10 @@ en: flags_received_count: Flags Received approve: 'Approve' approved_by: "approved by" + approve_success: "User approved and email sent with activation + instructions." + approve_bulk_success: "Success! All selected users have been approved + and notified." time_read: "Read Time" delete: "Delete User" delete_forbidden: "This user can't be deleted because there are posts. Delete all this user's posts first."