From 515406c05d6982dbb77417f072de43d4a164cfe7 Mon Sep 17 00:00:00 2001 From: xiaoyu <763691951@qq.com> Date: Wed, 21 Sep 2016 16:43:41 +0800 Subject: [PATCH] temp: deactive test --- apps/users/serializers.py | 2 ++ apps/users/templates/users/user_list.html | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/users/serializers.py b/apps/users/serializers.py index 9c8000cd3..24cf45095 100644 --- a/apps/users/serializers.py +++ b/apps/users/serializers.py @@ -75,3 +75,5 @@ class UserBulkUpdateSerializer(BulkSerializerMixin, serializers.ModelSerializer) class Meta(object): model = User list_serializer_class = BulkListSerializer + fields = ['id', 'is_active', 'username', 'name', 'email', 'role', 'avatar', + 'enable_otp', 'comment', 'groups'] diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index 189808878..a66da10be 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -66,21 +66,23 @@ {% endblock %} {% block custom_foot_js %} {% endblock %}