TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-06-12 12:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: typo in display name and gorm annotation (#325)

Browse Source 
* fix(management): map all fields in user grant view converter

* feat(management): add display name to user grant view

* fix(usergrant): typo in display name
This commit is contained in:
Silvan 2020-07-01 13:18:30 +02:00 committed by GitHub
parent f57913fdcc
commit c5a4eb3555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/management/repository/eventsourcing/handler/user_grant.go
View File

@ -162,7 +162,7 @@ func (u *UserGrant) fillUserData(grant *view_model.UserGrantView, user *usr_mode
grant.UserName = user.UserName grant.UserName = user.UserName
grant.FirstName = user.FirstName grant.FirstName = user.FirstName
grant.LastName = user.LastName grant.LastName = user.LastName
grant.DispalyName = user.DisplayName grant.DisplayName = user.DisplayName
grant.Email = user.EmailAddress grant.Email = user.EmailAddress
} }

6
internal/usergrant/repository/view/model/user_grant.go
View File

@ -30,7 +30,7 @@ type UserGrantView struct {
UserName string `json:"-" gorm:"column:user_name"` UserName string `json:"-" gorm:"column:user_name"`
FirstName string `json:"-" gorm:"column:first_name"` FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"` LastName string `json:"-" gorm:"column:last_name"`
DispalyName string `json:"-" grom:"column:display_name"` DisplayName string `json:"-" gorm:"column:display_name"`
Email string `json:"-" gorm:"column:email"` Email string `json:"-" gorm:"column:email"`
ProjectName string `json:"-" gorm:"column:project_name"` ProjectName string `json:"-" gorm:"column:project_name"`
OrgName string `json:"-" gorm:"column:org_name"` OrgName string `json:"-" gorm:"column:org_name"`
@ -55,7 +55,7 @@ func UserGrantFromModel(grant *model.UserGrantView) *UserGrantView {
UserName: grant.UserName, UserName: grant.UserName,
FirstName: grant.FirstName, FirstName: grant.FirstName,
LastName: grant.LastName, LastName: grant.LastName,
DispalyName: grant.DisplayName, DisplayName: grant.DisplayName,
Email: grant.Email, Email: grant.Email,
ProjectName: grant.ProjectName, ProjectName: grant.ProjectName,
OrgName: grant.OrgName, OrgName: grant.OrgName,
@ -76,7 +76,7 @@ func UserGrantToModel(grant *UserGrantView) *model.UserGrantView {
UserName: grant.UserName, UserName: grant.UserName,
FirstName: grant.FirstName, FirstName: grant.FirstName,
LastName: grant.LastName, LastName: grant.LastName,
DisplayName: grant.DispalyName, DisplayName: grant.DisplayName,
Email: grant.Email, Email: grant.Email,
ProjectName: grant.ProjectName, ProjectName: grant.ProjectName,
OrgName: grant.OrgName, OrgName: grant.OrgName,