Make organization.name not-nullable, consolidate org in dash context
This commit is contained in:
parent
4f0b73c769
commit
a4c0e367a8
13 changed files with 118 additions and 50 deletions
|
|
@ -95,10 +95,15 @@ func contentForUser(ctx context.Context, user *models.User) (User, error) {
|
|||
if err != nil {
|
||||
return User{}, err
|
||||
}
|
||||
org := user.R.Organization
|
||||
return User{
|
||||
DisplayName: user.DisplayName,
|
||||
Initials: extractInitials(user.DisplayName),
|
||||
Notifications: notifications,
|
||||
Organization: Organization {
|
||||
ID: int(org.ID),
|
||||
Name: org.Name,
|
||||
},
|
||||
Username: user.Username,
|
||||
}, nil
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue