summaryrefslogtreecommitdiff
path: root/web/apps/user_operation
diff options
context:
space:
mode:
authorMark Wong2019-05-29 17:18:00 +0000
committerMark Wong2019-05-29 17:18:00 +0000
commitcc41d3dba7d11cdd589a83f1284c0a47b444b7f6 (patch)
treeff6c6799cd550c74f4159b91dd8e3ea56da6f9a2 /web/apps/user_operation
parentcf7a951b9580e6839464194547efe28757741e98 (diff)
parent9f7c200c61ae0d8c44155404d21fb7f286ace32b (diff)
Merge branch 'master' of github.com:PGPerfFarm/pgperffarmHEADmaster
Diffstat (limited to 'web/apps/user_operation')
-rw-r--r--web/apps/user_operation/filters.py2
-rw-r--r--web/apps/user_operation/views.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/web/apps/user_operation/filters.py b/web/apps/user_operation/filters.py
index d429d96..a61ac8e 100644
--- a/web/apps/user_operation/filters.py
+++ b/web/apps/user_operation/filters.py
@@ -3,7 +3,7 @@
import django_filters
from django.db.models import Q
-from models import UserMachine
+from .models import UserMachine
from test_records.models import TestRecord
diff --git a/web/apps/user_operation/views.py b/web/apps/user_operation/views.py
index e7641cf..43696f6 100644
--- a/web/apps/user_operation/views.py
+++ b/web/apps/user_operation/views.py
@@ -8,11 +8,11 @@ from rest_framework import authentication
from rest_framework.pagination import PageNumberPagination
from rest_framework_jwt.authentication import JSONWebTokenAuthentication
-from filters import MachineRecordListFilter, UserMachineListFilter
+from .filters import MachineRecordListFilter, UserMachineListFilter
from test_records.models import TestRecord
from users.models import UserMachine, UserProfile
from users.serializer import CreateUserProfileSerializer
-from serializer import UserMachineManageSerializer, UserPortalInfoSerializer, TestRecordListSerializer, \
+from .serializer import UserMachineManageSerializer, UserPortalInfoSerializer, TestRecordListSerializer, \
UserMachineSerializer, CreateUserMachineSerializer
from rest_framework.response import Response
from rest_framework import status