Merge pull request haiwen#1517 from haiwen/batch-update

update user batch api
wendixiang · Mar 22, 2017 · 893f3db · 893f3db
2 parents 2568d72 + 0cdbac5
commit 893f3db
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/...2/endpoints/admin/batch_set_user_quota.py → seahub/api2/endpoints/admin/users_batch.py b/...2/endpoints/admin/batch_set_user_quota.py → seahub/api2/endpoints/admin/users_batch.py
@@ -20,20 +20,6 @@
 
 logger = logging.getLogger(__name__)
 
-# user fields returned by admin users api
-# {
-#     "email": "email",
-#     "name": "email2nickname(email)",
-#     "contact_email": Profile.objects.get_contact_email_by_user(email),
-#     "is_admin": True, # False
-#     "active": True, # False
-#     "role": "default", # guest
-#     "quota_total": 100000,
-#     "quota_used": 50000,
-#     "created_at": "2017-02-23T15:51:21+08:00",
-#     "last_login": "2017-02-27T15:51:21+08:00",
-# }
-
 
 class AdminUsersBatch(APIView):
     authentication_classes = (TokenAuthentication, SessionAuthentication)

diff --git a/seahub/urls.py b/seahub/urls.py
@@ -54,7 +54,7 @@
 from seahub.api2.endpoints.admin.group_libraries import AdminGroupLibraries, AdminGroupLibrary
 from seahub.api2.endpoints.admin.group_members import AdminGroupMembers, AdminGroupMember
 from seahub.api2.endpoints.admin.shares import AdminShares
-from seahub.api2.endpoints.admin.batch_set_user_quota import AdminUsersBatch
+from seahub.api2.endpoints.admin.users_batch import AdminUsersBatch
 
 # Uncomment the next two lines to enable the admin:
 #from django.contrib import admin