From fd6dd88afbe77e541921cf8e5bfe56a0eb170134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 29 Aug 2014 13:05:51 +0200
Subject: [PATCH] FIX: dual modal when deleting spammer in the flag modal

---
 .../javascripts/admin/routes/admin_flags_route.js    | 12 ------------
 .../javascripts/discourse/routes/application.js.es6  |  9 +++++++++
 .../discourse/templates/modal/flag.js.handlebars     |  3 +--
 3 files changed, 10 insertions(+), 14 deletions(-)

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}}
-    <button class="btn btn-danger" {{action deleteSpammer}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
+    <button class="btn btn-danger" {{action deleteSpammer userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
   {{/if}}
 </div>
-