Merge pull request #6761 from mrfinch/saurabh/show-popup

FIX:show popup before bulk invite

app/assets/javascripts/discourse/components/csv-uploader.js.es6

@@ -25,5 +25,22 @@ export default Em.Component.extend(UploadMixin, {
 
   uploadDone() {
     bootbox.alert(I18n.t("user.invited.bulk_invite.success"));
-  }
+  },
+
+  uploadOptions() {
+    return { autoUpload: false };
+  },
+
+  _init: function() {
+    const $upload = this.$();
+
+    $upload.on("fileuploadadd", (e, data) => {
+      bootbox.confirm(
+        I18n.t("user.invited.bulk_invite.confirmation_message"),
+        I18n.t("cancel"),
+        I18n.t("go_ahead"),
+        result => (result ? data.submit() : data.abort())
+      );
+    });
+  }.on("didInsertElement")
 });

app/assets/javascripts/discourse/mixins/upload.js.es6

@@ -96,7 +96,9 @@ export default Em.Mixin.create({
     });
 
     $upload.on("fileuploadfail", (e, data) => {
-      displayErrorForUpload(data);
+      if (!data || (data && data.errorThrown !== "abort")) {
+        displayErrorForUpload(data);
+      }
       reset();
     });
   }.on("didInsertElement"),