This commit is contained in:
virusdefender
2017-01-23 16:48:04 +08:00
parent cfde5b93e5
commit d9fad97e35
27 changed files with 46 additions and 52 deletions

View File

@@ -1,9 +1,9 @@
from __future__ import unicode_literals
import functools
from django.utils.translation import ugettext as _
from utils.api import JSONResponse
from .models import AdminType

View File

@@ -1,8 +1,10 @@
import time
from django.utils.translation import ugettext as _
from django.contrib import auth
from django.utils.translation import ugettext as _
from utils.api import JSONResponse
from .models import AdminType

View File

@@ -2,11 +2,12 @@
# Generated by Django 1.9.12 on 2017-01-23 07:59
from __future__ import unicode_literals
import account.models
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import jsonfield.fields
from django.conf import settings
from django.db import migrations, models
import account.models
class Migration(migrations.Migration):

View File

@@ -1,6 +1,6 @@
from utils.api import serializers, DateTimeTZField
from utils.api import DateTimeTZField, serializers
from .models import User, AdminType
from .models import AdminType, User
class UserLoginSerializer(serializers.Serializer):

View File

@@ -3,12 +3,12 @@ from unittest import mock
from django.contrib import auth
from django.utils.translation import ugettext as _
from otpauth import OtpAuth
from utils.shortcuts import rand_str
from utils.api.tests import APITestCase, APIClient
from .models import User, AdminType
from utils.api.tests import APIClient, APITestCase
from utils.shortcuts import rand_str
from .models import AdminType, User
class PermissionDecoratorTest(APITestCase):

View File

@@ -1,6 +1,6 @@
from django.conf.urls import url
from ..views.oj import UserLoginAPI, UserRegisterAPI, UserChangePasswordAPI
from ..views.oj import UserChangePasswordAPI, UserLoginAPI, UserRegisterAPI
urlpatterns = [
url(r"^login$", UserLoginAPI.as_view(), name="user_login_api"),

View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from django.core.exceptions import MultipleObjectsReturned
from django.db.models import Q
from django.utils.translation import ugettext as _
@@ -9,7 +7,7 @@ from utils.shortcuts import rand_str
from ..decorators import super_admin_required
from ..models import User
from ..serializers import (UserSerializer, EditUserSerializer)
from ..serializers import EditUserSerializer, UserSerializer
class UserAdminAPI(APIView):

View File

@@ -1,15 +1,15 @@
from django.contrib import auth
from django.core.exceptions import MultipleObjectsReturned
from django.utils.translation import ugettext as _
from otpauth import OtpAuth
from utils.api import APIView, validate_serializer
from utils.captcha import Captcha
from ..decorators import login_required
from ..models import User, UserProfile
from ..serializers import (UserLoginSerializer, UserRegisterSerializer,
UserChangePasswordSerializer)
from ..serializers import (UserChangePasswordSerializer, UserLoginSerializer,
UserRegisterSerializer)
class UserLoginAPI(APIView):