From 521cb6bd0d36368bee7e7793ec9eef408fe4443b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 29 Aug 2014 12:54:24 +0200
Subject: [PATCH] FIX: dual modal when selecting 'delete spammer' in flags
 section

---
 app/assets/javascripts/admin/routes/admin_flags_route.js | 4 +---
 app/assets/javascripts/discourse/controllers/flag.js.es6 | 7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin_flags_route.js b/app/assets/javascripts/admin/routes/admin_flags_route.js
index e1d30fe6865..dafd8b22103 100644
--- a/app/assets/javascripts/admin/routes/admin_flags_route.js
+++ b/app/assets/javascripts/admin/routes/admin_flags_route.js
@@ -22,6 +22,7 @@ Discourse.AdminFlagsRouteType = Discourse.Route.extend({
       @method deleteSpammer
     **/
     deleteSpammer: function (user) {
+      this.send('closeModal');
       user.deleteAsSpammer(function() { window.location.reload(); });
     }
   }
@@ -50,6 +51,3 @@ Discourse.AdminFlagsActiveRoute = Discourse.AdminFlagsRouteType.extend({
 Discourse.AdminFlagsOldRoute = Discourse.AdminFlagsRouteType.extend({
   filter: 'old'
 });
-
-
-
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index b4ef30e3f5e..38bacc91a8d 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -105,7 +105,7 @@ export default ObjectController.extend(ModalFunctionality, {
 
     changePostActionType: function(action) {
       this.set('selected', action);
-    }
+    },
   },
 
   canDeleteSpammer: function() {
@@ -118,11 +118,6 @@ export default ObjectController.extend(ModalFunctionality, {
     }
   }.property('selected.name_key', 'userDetails.can_be_deleted', 'userDetails.can_delete_all_posts'),
 
-  deleteSpammer: function() {
-    this.send('closeModal');
-    this.get('userDetails').deleteAsSpammer(function() { window.location.reload(); });
-  },
-
   usernameChanged: function() {
     this.set('userDetails', null);
     this.fetchUserDetails();