From 5dbda20387da04c28a71da894e5b814d47647a9d Mon Sep 17 00:00:00 2001 From: Sean Smith Date: Thu, 23 Jul 2020 14:49:22 -0400 Subject: [PATCH] Fixes get_user for api. Change-Id: I2111c8dc3a66dc1e6d4b8ccab53d4a14acafd913 Signed-off-by: Sean Smith --- src/api/models.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/api/models.py b/src/api/models.py index addc02d..960fc26 100644 --- a/src/api/models.py +++ b/src/api/models.py @@ -176,12 +176,12 @@ class LabManager(object): def format_user(self, userprofile): return { - "id": userprofile.user.id, - "username": userprofile.user.username, - "email": userprofile.email_addr, - "first_name": userprofile.user.first_name, - "last_name": userprofile.user.last_name, - "company": userprofile.company + "id": userprofile.user.id, + "username": userprofile.user.username, + "email": userprofile.email_addr, + "first_name": userprofile.user.first_name, + "last_name": userprofile.user.last_name, + "company": userprofile.company } def get_users(self): @@ -190,7 +190,9 @@ class LabManager(object): return json.dumps({"users": userlist}) def get_user(self, user_id): - profile = get_object_or_404(UserProfile, pk=user_id) + user = User.objects.get(pk=user_id) + + profile = get_object_or_404(UserProfile, user=user) return json.dumps(self.format_user(profile)) -- 2.16.6