From 0c0b7ce3a7a4fee523245859d5b84751ecf200ba Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Sat, 27 Aug 2022 06:55:55 +0000 Subject: [PATCH] More preferred name --- apiserver/apiserver/api/signals.py | 2 +- apiserver/apiserver/api/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apiserver/apiserver/api/signals.py b/apiserver/apiserver/api/signals.py index 815d5b8..6ee2163 100644 --- a/apiserver/apiserver/api/signals.py +++ b/apiserver/apiserver/api/signals.py @@ -11,7 +11,7 @@ from . import models from .permissions import is_admin_director def get_object_owner(obj): - full_name = lambda member: member.first_name + ' ' + member.last_name + full_name = lambda member: member.preferred_name + ' ' + member.last_name if obj.__class__.__name__ == 'Member': return full_name(obj), obj.id diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index f245073..04aa1b4 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -570,7 +570,7 @@ class LockoutViewSet(viewsets.ViewSet, List): authorization = {} authorization['id'] = member.id - authorization['name'] = member.first_name + ' ' + member.last_name + authorization['name'] = member.preferred_name + ' ' + member.last_name authorization['common'] = bool(member.orientation_date or member.vetted_date) authorization['lathe'] = bool(member.lathe_cert_date) and authorization['common'] authorization['mill'] = bool(member.mill_cert_date) and authorization['common']