From f4c080dd192c8b62300d694e66f3de4bc013ec75 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 16 Sep 2019 15:45:26 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20API=E5=85=81=E8=AE=B8=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=89=8D=E7=AB=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/api/user.py                    |  6 ++++--
 apps/users/templates/users/user_list.html | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/users/api/user.py b/apps/users/api/user.py
index ac661e457..1864f72f4 100644
--- a/apps/users/api/user.py
+++ b/apps/users/api/user.py
@@ -60,8 +60,10 @@ class UserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
             self.permission_classes = (IsOrgAdminOrAppUser,)
         return super().get_permissions()
 
-    def allow_bulk_destroy(self, qs, filtered):
-        return False
+    def perform_bulk_destroy(self, objects):
+        for obj in objects:
+            self.check_object_permissions(self.request, obj)
+            self.perform_destroy(obj)
 
     def perform_bulk_update(self, serializer):
         # TODO: 需要测试
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index 046a77822..d992416d1 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -258,25 +258,28 @@ $(document).ready(function(){
         },function () {
             function success(data) {
                 url = setUrlParam(the_url, 'spm', data.spm);
+                function success() {
+                    var msg = "{% trans 'User Deleted.' %}";
+                    swal("{% trans 'User Delete' %}", msg, "success");
+                }
+                function fail() {
+                    var msg = "{% trans 'User Deleting failed.' %}";
+                    swal("{% trans 'User Delete' %}", msg, "error");
+                }
                 requestApi({
                     url:url,
                     method:'DELETE',
+                    flash_message:true,
                     success:reloadPage,
-                    flash_message:false,
+                    error: fail
                  });
-                var msg = "{% trans 'User Deleted.' %}";
-                swal("{% trans 'User Delete' %}", msg, "success");
-            }
-            function fail() {
-                var msg = "{% trans 'User Deleting failed.' %}";
-                swal("{% trans 'User Delete' %}", msg, "error");
             }
             requestApi({
                 url: "{% url 'api-common:resources-cache' %}",
                 method:'POST',
                 body:JSON.stringify(data),
+                flash_message:false,
                 success:success,
-                error:fail
              })
         })
     }