diff --git a/apps/common/serializers/mixin.py b/apps/common/serializers/mixin.py index e8e1b48d2..583b15e5c 100644 --- a/apps/common/serializers/mixin.py +++ b/apps/common/serializers/mixin.py @@ -14,6 +14,7 @@ from rest_framework.exceptions import ValidationError from rest_framework.fields import SkipField, empty from rest_framework.settings import api_settings from rest_framework.utils import html +from rest_framework_bulk.serializers import BulkListSerializer from common.db.fields import EncryptMixin from common.serializers.fields import ( @@ -72,7 +73,6 @@ class BulkSerializerMixin(object): """ def to_internal_value(self, data): - from rest_framework_bulk import BulkListSerializer ret = super(BulkSerializerMixin, self).to_internal_value(data) diff --git a/apps/users/filters.py b/apps/users/filters.py index 6c8648e08..0d45b989f 100644 --- a/apps/users/filters.py +++ b/apps/users/filters.py @@ -52,7 +52,7 @@ class UserFilter(BaseFilterSet): if name == 'is_password_expired': key = 'date_password_last_updated' - elif name == 'long_time_no_login': + elif name == 'is_long_time_no_login': key = 'last_login' else: raise ValueError('Invalid filter name')