From 0c86fb539c46fad1ab8a99699ba0ade18b41e647 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 9 Jan 2016 16:50:46 +0800
Subject: [PATCH] [group settings] complete 'import members'

---
 seahub/templates/js/templates.html         |  2 +-
 static/scripts/app/views/group-settings.js | 25 +++++++++++++++++++---
 static/scripts/common.js                   |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 4225efdde2..17796330b1 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -960,8 +960,8 @@
     <h3>{% trans "Import group members from a CSV file" %}</h3>
     <input type="file" name="file" />
     <p class="tip">{% trans "File format: user@mail.com" %}</p>
-    <p class="error hide">{% trans "Please choose a CSV file" %}</p>
     <button type="submit" class="submit">{% trans "Submit" %}</button>
+    <p class="error hide"></p>
 </form>
 </script>
 <script type="text/template" id="group-manage-members-tmpl">
diff --git a/static/scripts/app/views/group-settings.js b/static/scripts/app/views/group-settings.js
index 89cb3f1c4e..1122d4f405 100644
--- a/static/scripts/app/views/group-settings.js
+++ b/static/scripts/app/views/group-settings.js
@@ -246,7 +246,6 @@ define([
             });
         },
 
-        // TODO: finish it after the backend py is done.
         importMembers: function() {
             var _this = this;
             var $form = $(this.importMembersTemplate());
@@ -255,8 +254,9 @@ define([
 
             $form.submit(function() {
                 var $fileInput = $('[name=file]', $form)[0];
+                var $error = $('.error', $form);
                 if (!$fileInput.files.length) {
-                    $('.error', $form).removeClass('hide');
+                    $error.html(gettext("Please choose a CSV file")).removeClass('hide');
                     return false;
                 }
 
@@ -278,8 +278,27 @@ define([
                     contentType: false, // tell jQuery not to set contentType
                     beforeSend: Common.prepareCSRFToken,
                     success: function(data) {
+                        if (data.failed.length > 0) {
+                            var err_msg = '';
+                            $(data.failed).each(function(index, item) {
+                                err_msg += item.email + ': ' + item.error_msg + '<br />';
+                            });
+                            $error.html(err_msg).removeClass('hide');
+                            Common.enableButton($submitBtn);
+                        } else {
+                            $.modal.close();
+                            Common.feedback(gettext("Successfully imported."), 'success');
+                        }
                     },
-                    error: function () {
+                    error: function(xhr) {
+                        var error_msg;
+                        if (xhr.responseText) {
+                            error_msg = $.parseJSON(xhr.responseText).error;
+                        } else {
+                            error_msg = gettext("Failed. Please check the network.");
+                        }
+                        $error.html(error_msg).removeClass('hide');
+                        Common.enableButton($submitBtn);
                     }
                 });
                 return false;
diff --git a/static/scripts/common.js b/static/scripts/common.js
index 5822a46a2c..c3e344f649 100644
--- a/static/scripts/common.js
+++ b/static/scripts/common.js
@@ -107,6 +107,7 @@ define([
               case 'group_members': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/members/';
               case 'group_member': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/members/' + options.email + '/';
               case 'group_member_bulk': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/members/bulk/';
+              case 'group_import_members': return siteRoot + 'ajax/group/' + options.group_id + '/members/import/';
               case 'group_repos': return siteRoot + 'api2/groups/' + options.group_id + '/repos/';
               case 'toggle_group_modules': return siteRoot + 'ajax/group/' + options.group_id + '/toggle-modules/';
               case 'toggle_personal_modules': return siteRoot + 'ajax/toggle-personal-modules/';