diff --git a/app/assets/javascripts/admin/routes/admin_flags_route.js b/app/assets/javascripts/admin/routes/admin_flags_route.js
index dafd8b22103..a8c7cc1ecf6 100644
--- a/app/assets/javascripts/admin/routes/admin_flags_route.js
+++ b/app/assets/javascripts/admin/routes/admin_flags_route.js
@@ -15,18 +15,6 @@ Discourse.AdminFlagsRouteType = Discourse.Route.extend({
adminFlagsController.set('query', this.get('filter'));
},
- actions: {
- /**
- Deletes a user and all posts and topics created by that user.
-
- @method deleteSpammer
- **/
- deleteSpammer: function (user) {
- this.send('closeModal');
- user.deleteAsSpammer(function() { window.location.reload(); });
- }
- }
-
});
Discourse.AdminFlagsActiveRoute = Discourse.AdminFlagsRouteType.extend({
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 71da530d03b..2d15c1d4572 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -136,7 +136,16 @@ var ApplicationRoute = Em.Route.extend({
router.controllerFor('editCategory').set('selectedTab', 'general');
});
}
+ },
+ /**
+ Deletes a user and all posts and topics created by that user.
+
+ @method deleteSpammer
+ **/
+ deleteSpammer: function (user) {
+ this.send('closeModal');
+ user.deleteAsSpammer(function() { window.location.reload(); });
}
},
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars b/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
index 4a06a87f378..41d95f33073 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
@@ -28,7 +28,6 @@
{{/if}}
{{#if canDeleteSpammer}}
-
+
{{/if}}
-