From bb6394150d6dd59f7df908826a90d2e4b7976a61 Mon Sep 17 00:00:00 2001 From: ibuler Date: Sun, 12 Aug 2018 15:52:16 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=84=E4=BA=A7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/asset.py | 2 +- apps/users/serializers.py | 3 ++- requirements/requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index 48e778eac..a3661db5c 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -20,7 +20,7 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer): model = Asset list_serializer_class = BulkListSerializer fields = '__all__' - validators = [] # If not set to [], partial bulk update will be error + validators = [] def get_field_names(self, declared_fields, info): fields = super().get_field_names(declared_fields, info) diff --git a/apps/users/serializers.py b/apps/users/serializers.py index 21103c6a8..9f99c0171 100644 --- a/apps/users/serializers.py +++ b/apps/users/serializers.py @@ -23,6 +23,7 @@ class UserSerializer(BulkSerializerMixin, serializers.ModelSerializer): 'first_name', 'last_name', 'password', '_private_key', '_public_key', '_otp_secret_key', 'user_permissions' ] + # validators = [] def get_field_names(self, declared_fields, info): fields = super(UserSerializer, self).get_field_names(declared_fields, info) @@ -71,7 +72,7 @@ class UserGroupSerializer(BulkSerializerMixin, serializers.ModelSerializer): class UserGroupUpdateMemeberSerializer(serializers.ModelSerializer): - users = serializers.PrimaryKeyRelatedField(many=True, queryset = User.objects.all()) + users = serializers.PrimaryKeyRelatedField(many=True, queryset=User.objects.all()) class Meta: model = UserGroup diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4373a83da..ba44a9281 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -14,11 +14,11 @@ coreapi==2.3.3 coreschema==0.0.4 cryptography==2.1.4 decorator==4.1.2 -Django==2.0.7 +Django==2.1.0 django-auth-ldap==1.3.0 django-bootstrap3==9.1.0 django-celery-beat==1.1.1 -django-filter==1.1.0 +django-filter==2.0.0 django-formtools==2.1 django-ranged-response==0.2.0 django-redis-cache==1.7.1