From 428b71687fde95a91256627589974b92cb8135ea Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Sat, 22 Nov 2014 01:16:10 +0530
Subject: [PATCH] return a promise instead of triggering bootbox in model

---
 app/assets/javascripts/admin/models/export_csv.js         | 8 +-------
 .../javascripts/admin/routes/admin_users_list_routes.js   | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/models/export_csv.js b/app/assets/javascripts/admin/models/export_csv.js
index 9994db97d89..b747cd449be 100644
--- a/app/assets/javascripts/admin/models/export_csv.js
+++ b/app/assets/javascripts/admin/models/export_csv.js
@@ -15,13 +15,7 @@ Discourse.ExportCsv.reopenClass({
     @method export_user_list
   **/
   exportUserList: function() {
-    return Discourse.ajax("/admin/export_csv/users.json").then(function(result) {
-      if (result.success) {
-        bootbox.alert(I18n.t("admin.export_csv.success"));
-      } else {
-        bootbox.alert(I18n.t("admin.export_csv.failed"));
-      }
-    });
+    return Discourse.ajax("/admin/export_csv/users.json");
   },
 
   /**
diff --git a/app/assets/javascripts/admin/routes/admin_users_list_routes.js b/app/assets/javascripts/admin/routes/admin_users_list_routes.js
index bc1516c182b..a6b2b330b7d 100644
--- a/app/assets/javascripts/admin/routes/admin_users_list_routes.js
+++ b/app/assets/javascripts/admin/routes/admin_users_list_routes.js
@@ -13,7 +13,13 @@ Discourse.AdminUsersListRoute = Discourse.Route.extend({
 
   actions: {
     exportUsers: function() {
-      Discourse.ExportCsv.exportUserList();
+      Discourse.ExportCsv.exportUserList().then(function(result) {
+        if (result.success) {
+          bootbox.alert(I18n.t("admin.export_csv.success"));
+        } else {
+          bootbox.alert(I18n.t("admin.export_csv.failed"));
+        }
+      });
     }
   }
 });