summaryrefslogtreecommitdiff
path: root/web/apps/users
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/users
parentcf7a951b9580e6839464194547efe28757741e98 (diff)
parent9f7c200c61ae0d8c44155404d21fb7f286ace32b (diff)
Merge branch 'master' of github.com:PGPerfFarm/pgperffarmHEADmaster
Diffstat (limited to 'web/apps/users')
-rw-r--r--web/apps/users/admin.py2
-rw-r--r--web/apps/users/jwt_handler.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/web/apps/users/admin.py b/web/apps/users/admin.py
index 2c31eef..c7ef0fa 100644
--- a/web/apps/users/admin.py
+++ b/web/apps/users/admin.py
@@ -5,7 +5,7 @@ from django.contrib import admin
from asynchronous_send_mail import send_mail
from django.conf import settings
# Register your models here.
-from serializer import UserMachineSerializer
+from .serializer import UserMachineSerializer
from .models import UserMachine, UserProfile
class UserProfileAdmin(admin.ModelAdmin):
diff --git a/web/apps/users/jwt_handler.py b/web/apps/users/jwt_handler.py
index 7dfdb94..ff8fdaa 100644
--- a/web/apps/users/jwt_handler.py
+++ b/web/apps/users/jwt_handler.py
@@ -1,4 +1,4 @@
-from serializer import JWTUserProfileSerializer
+from .serializer import JWTUserProfileSerializer
# user jwt handler
def jwt_response_payload_handler(token, user=None, request=None):