Merge pull request #3227 from jumpserver/dev_users

[Update] API允许批量删除用户，修改前端提示信息逻辑

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: 需要测试

apps/users/templates/users/user_list.html

@@ -258,12 +258,7 @@ $(document).ready(function(){
         },function () {
             function success(data) {
                 url = setUrlParam(the_url, 'spm', data.spm);
-                requestApi({
-                    url:url,
-                    method:'DELETE',
-                    success:reloadPage,
-                    flash_message:false,
-                 });
+                function success() {
                     var msg = "{% trans 'User Deleted.' %}";
                     swal("{% trans 'User Delete' %}", msg, "success");
                 }
@@ -271,12 +266,20 @@ $(document).ready(function(){
                     var msg = "{% trans 'User Deleting failed.' %}";
                     swal("{% trans 'User Delete' %}", msg, "error");
                 }
+                requestApi({
+                    url:url,
+                    method:'DELETE',
+                    flash_message:true,
+                    success:reloadPage,
+                    error: fail
+                 });
+            }
             requestApi({
                 url: "{% url 'api-common:resources-cache' %}",
                 method:'POST',
                 body:JSON.stringify(data),
+                flash_message:false,
                 success:success,
-                error:fail
              })
         })
     }