darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 13:09:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3853 from alphagov/unknown-event-doer

Browse Source 
Don't show user as unknown for service history
This commit is contained in:
David McDonald
2021-04-06 16:33:29 +01:00
committed by GitHub
parent 1d64fd6923 4acca3de4d
commit e454a24e3d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.py
View File

@@ -652,6 +652,12 @@ class Users(ModelList):
for user in self: for user in self:
if user.id == id: if user.id == id:
return user.name return user.name
# The user may not exist in the list of users for this service if they are
# a platform admin or if they have since left the team. In this case, we fall
# back to getting the user from the API (or Redis if it is in the cache)
user = User.from_id(id)
if user and user.name:
return user.name
return 'Unknown' return 'Unknown'

4
tests/app/main/views/test_history.py
View File

@@ -36,7 +36,7 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
'Created an API key called ‘Good key’ ' 'Created an API key called ‘Good key’ '
'Test User 10:09am ' 'Test User 10:09am '
'Created an API key called ‘Key event returned in non-chronological order’ ' 'Created an API key called ‘Key event returned in non-chronological order’ '
'Unknown 2:01am ' 'Test User 2:01am '
'Created this service and called it ‘Example service’' 'Created this service and called it ‘Example service’'
), ),
), ),
@@ -79,7 +79,7 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
( (
'10 October 2010', '10 October 2010',
( (
'Unknown 2:01am ' 'Test User 2:01am '
'Created this service and called it ‘Example service’' 'Created this service and called it ‘Example service’'
), ),
), ),