nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 02:52:50 -05:00
Code Activity

[SG-927] Pull the user's selected avatar color from the state store and display on Emergency Contacts page (#2582)

Browse Source 
* work: backend changes

* fix: lets not mix up Grantor and Grantee

* work: update view
This commit is contained in:
Brandon Maharaj
2023-01-20 13:11:16 -05:00
committed by GitHub
parent 7b4c9b0e59
commit 862ce01bf4
4 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sql/dbo/Views/EmergencyAccessDetailsView.sql
View File

@ -4,8 +4,10 @@ SELECT
EA.*,
GranteeU.[Name] GranteeName,
ISNULL(GranteeU.[Email], EA.[Email]) GranteeEmail,
GranteeU.[AvatarColor] GranteeAvatarColor,
GrantorU.[Name] GrantorName,
GrantorU.[Email] GrantorEmail
GrantorU.[Email] GrantorEmail,
GrantorU.[AvatarColor] GrantorAvatarColor
FROM
[dbo].[EmergencyAccess] EA
LEFT JOIN